Commits · 06be40cf8ef75d3bdc2951d41480252c140a015a · order-group-application / order-group · GitLab

23 Nov, 2020 9 commits
- 升级sdk · 06be40cf
  徐康 committed Nov 23, 2020
  
  06be40cf Browse Files
- 升级sdk · 3a4bee1f
  徐康 committed Nov 23, 2020
  
  3a4bee1f Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop · ffd45045
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Nov 23, 2020
  ffd45045 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · df2da0fe
  刘鹏飞 committed Nov 23, 2020
  
  df2da0fe Browse Files
- 权益卡金额 · 0ec414fd
  徐康 committed Nov 23, 2020
  
  0ec414fd Browse Files
- 恢复代码 · ec7d481f
  徐康 committed Nov 23, 2020
  
  ec7d481f Browse Files
- 针对coco需求，拓展固定配送费 · e8935d75
  刘鹏飞 committed Nov 23, 2020
  
  e8935d75 Browse Files
- Revert "sdk版本回复" · 3fc5c902
```
This reverts commit 3f766143
```
  徐康 committed Nov 23, 2020
  3fc5c902 Browse Files
- 恢复代码 · 71994236
  徐康 committed Nov 23, 2020
  
  71994236 Browse Files
20 Nov, 2020 11 commits
- 转换对象添加取餐码 · 885aae9c
  zhiheng.zhang committed Nov 20, 2020
  
  885aae9c Browse Files
- 转换对象添加取餐码 · ab861ed4
  zhiheng.zhang committed Nov 20, 2020
  
  ab861ed4 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · e8aa8730
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  zhiheng.zhang committed Nov 20, 2020
  e8aa8730 Browse Files
- 转换对象添加取餐码 · 7d6e24e3
  zhiheng.zhang committed Nov 20, 2020
  
  7d6e24e3 Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · c0aad8c1
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  zhiheng.zhang committed Nov 20, 2020
  c0aad8c1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 92960e20
  zhiheng.zhang committed Nov 20, 2020
  
  92960e20 Browse Files
- sdk添加取餐码 · 1797707f
  zhiheng.zhang committed Nov 20, 2020
  
  1797707f Browse Files
- oms退款金额修改日志打印修改 · f9ec2687
  zhiheng.zhang committed Nov 20, 2020
  
  f9ec2687 Browse Files
- oms退款金额修改 · fc91c25d
  zhiheng.zhang committed Nov 20, 2020
  
  fc91c25d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0.1-collageOrder-刘鹏飞' into develop · cd22e516
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 20, 2020
  cd22e516 Browse Files
- svc卡支付拼单购物车查询 · c691b31e
  刘鹏飞 committed Nov 20, 2020
  
  c691b31e Browse Files
19 Nov, 2020 20 commits
- 修改包装费 · f4185ad6
  刘鹏飞 committed Nov 19, 2020
  
  f4185ad6 Browse Files
- 功能代码恢复 · 4bb3e6f6
  徐康 committed Nov 19, 2020
  
  4bb3e6f6 Browse Files
- sdk版本回复 · 3f766143
  徐康 committed Nov 19, 2020
  
  3f766143 Browse Files
- 功能暂时不上线 · 34a15520
  徐康 committed Nov 19, 2020
  
  34a15520 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · 0ad9d806
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
```
  zhiheng.zhang committed Nov 19, 2020
  0ad9d806 Browse Files
- 重新调整购物车svc卡计算逻辑 · df2dcc00
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  df2dcc00 Browse Files
- 提示信息 · 74381499
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  74381499 Browse Files
- assortment-order-center-sdk 升级2.2.4 · d4f0eb84
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  d4f0eb84 Browse Files
- Merge branch 'develop' of… · 4e66b3e3
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  4e66b3e3 Browse Files
- assortment-ordercenter-sdk升级为2.2.3-SNAPSHOT · 473a2957
  刘鹏飞 committed Nov 19, 2020
  
  473a2957 Browse Files
- Merge branch 'feature/2020-1104-混合支付' into develop · baf68f68
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  baf68f68 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/gatherSpot-刘鹏飞' into develop · b020010b
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Nov 19, 2020
  b020010b Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · 8f79b24d
  刘鹏飞 committed Nov 19, 2020
  
  8f79b24d Browse Files
- Merge remote-tracking branch 'origin/feature/gatherSpot-刘鹏飞' into feature/gatherSpot-刘鹏飞 · 3397ebb8
  刘鹏飞 committed Nov 19, 2020
  
  3397ebb8 Browse Files
- 集点活动筛选需要判断活动的类型不能为空 · b601fcc6
  刘鹏飞 committed Nov 19, 2020
  
  b601fcc6 Browse Files
- Merge branch 'develop' of… · 92b4005f
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

 Conflicts:
	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
```
  xiaoer.li@freemud.com committed Nov 19, 2020
  92b4005f Browse Files
- add:原先订单支付方式入库 · 96d0648e
  xiaoer.li@freemud.com committed Nov 19, 2020
  
  96d0648e Browse Files
- jar包版本升级 · e3cfaa4e
  zhiheng.zhang committed Nov 19, 2020
  
  e3cfaa4e Browse Files
- Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · a45e4c4d
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  zhiheng.zhang committed Nov 19, 2020
  a45e4c4d Browse Files
- jar包版本升级 · be18da2e
  zhiheng.zhang committed Nov 19, 2020
  
  be18da2e Browse Files