Commits · 3db8db0d34bbe08bb1592f08e9f614b3db50cfe2 · order-group-application / order-group

13 May, 2021 10 commits
- Merge branch 'feature/20210414-华莱士需求-张志恒' · 3db8db0d
  zhiheng.zhang committed May 13, 2021
  
  3db8db0d Browse Files
- 升级sdk · 622411a9
  徐康 committed May 13, 2021
  
  622411a9 Browse Files
- 周四版本有售后单的不显示按钮 · c6e35a53
  zhiheng.zhang committed May 13, 2021
  
  c6e35a53 Browse Files
- 合代码 · d4b068f2
  徐康 committed May 13, 2021
  
  d4b068f2 Browse Files
- Merge branch 'feature/xukang_20210407_麦咖啡p6v3' · 6ef932f2
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  徐康 committed May 13, 2021
  6ef932f2 Browse Files
- 周四版本有售后单的不显示按钮 · 3d6b0c74
  zhiheng.zhang committed May 13, 2021
  
  3d6b0c74 Browse Files
- SDK升级 · b75f4ef1
  chongfu.liang committed May 13, 2021
  
  b75f4ef1 Browse Files
- Merge branch 'feature/20210429-美团聚宝盆换名-lcf' · b8a1b510
  chongfu.liang committed May 13, 2021
  
  b8a1b510 Browse Files
- 周四版本有售后单的不显示按钮 · 07f23e34
  zhiheng.zhang committed May 13, 2021
  
  07f23e34 Browse Files
- 配送费计算调整 · 7e242e6f
  zhiheng.zhang committed May 13, 2021
  
  7e242e6f Browse Files
12 May, 2021 5 commits
- 配送费计算调整 · d7da1890
  zhiheng.zhang committed May 12, 2021
  
  d7da1890 Browse Files
- 配送费计算调整 · 887e19da
  zhiheng.zhang committed May 12, 2021
  
  887e19da Browse Files
- 麦咖啡新增优惠券类型 · 3d180883
  徐康 committed May 12, 2021
  
  3d180883 Browse Files
- Merge branch 'featur/20210429-订单取消后库存增加-zy' · 41b99c8f
  张跃 committed May 12, 2021
  
  41b99c8f Browse Files
- 配送费计算调整 · 6e4a8ebe
  zhiheng.zhang committed May 12, 2021
  
  6e4a8ebe Browse Files
11 May, 2021 25 commits
- 配送无pre环境，写死配送费1l给测试使用 · b446bb0d
  hanghang.wang committed May 12, 2021
  
  b446bb0d Browse Files
- 配送费回退 · 9ab8897b
  zhiheng.zhang committed May 11, 2021
  
  9ab8897b Browse Files
- Merge remote-tracking branch 'origin/master' · ef09fdf9
  zhiheng.zhang committed May 11, 2021
  
  ef09fdf9 Browse Files
- 配送费回退 · 10e59cdb
  zhiheng.zhang committed May 11, 2021
  
  10e59cdb Browse Files
- 配送无pre环境，写死配送费1l给测试使用 · fbfde88f
  hanghang.wang committed May 11, 2021
  
  fbfde88f Browse Files
- sdk 升级 · 5d4e0997
  zhiheng.zhang committed May 11, 2021
  
  5d4e0997 Browse Files
- Merge remote-tracking branch 'origin/master' · 44e9137c
  zhiheng.zhang committed May 11, 2021
  
  44e9137c Browse Files
- sdk 升级 · ca298c63
  zhiheng.zhang committed May 11, 2021
  
  ca298c63 Browse Files
- 配送无pre环境，写死配送费1l给测试使用 · befcbd82
  hanghang.wang committed May 11, 2021
  
  befcbd82 Browse Files
- sdk 升级 · 11ce3140
  zhiheng.zhang committed May 11, 2021
  
  11ce3140 Browse Files
- Merge remote-tracking branch 'origin/master' · 9b51bba5
  zhiheng.zhang committed May 11, 2021
  
  9b51bba5 Browse Files
- sdk 升级 · 093a74ee
  zhiheng.zhang committed May 11, 2021
  
  093a74ee Browse Files
- Merge branch 'feature-20210426/xxl-job上报订单微信数据-周晓航' · b71d31d0
  周晓航 committed May 11, 2021
  
  b71d31d0 Browse Files
- 注释 xxl-job 配置使用 LTS管理 · c4ca0a39
  周晓航 committed May 11, 2021
  
  c4ca0a39 Browse Files
- 合并 2.0.28 订单统计上报有数 · 33792f06
  周晓航 committed May 11, 2021
  
  33792f06 Browse Files
- Merge branch 'feature-20210426/xxl-job上报订单微信数据-周晓航' · aa804d89
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
```
  周晓航 committed May 11, 2021
  aa804d89 Browse Files
- Merge remote-tracking branch 'origin/master' · d3dc3880
  周晓航 committed May 11, 2021
  
  d3dc3880 Browse Files
- 合并新创建订单优化代码 · 6e3e3609
  周晓航 committed May 11, 2021
  
  6e3e3609 Browse Files
- Merge branch 'feature/20210106_xukang_订单代码优化' · 27f31293
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/constant/ResponseCodeConstant.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed May 11, 2021
  27f31293 Browse Files
- sdk 升级 · 53aa852a
  zhiheng.zhang committed May 11, 2021
  
  53aa852a Browse Files
- Merge branch 'feature/20210414-华莱士需求-张志恒' · 88579304
  zhiheng.zhang committed May 11, 2021
  
  88579304 Browse Files
- 额外添加接口测试生产的任务触发机制 · 8fd1cef6
  周晓航 committed May 11, 2021
  
  8fd1cef6 Browse Files
- Merge remote-tracking branch 'origin/feature-20210426/xxl-job上报订单微信数据-周晓航' into… · 80cd12d2
```
Merge remote-tracking branch 'origin/feature-20210426/xxl-job上报订单微信数据-周晓航' into feature-20210426/xxl-job上报订单微信数据-周晓航
```
  周晓航 committed May 11, 2021
  80cd12d2 Browse Files
- 额外添加接口测试生产的任务触发机制 · 7dcc0b2f
  周晓航 committed May 11, 2021
  
  7dcc0b2f Browse Files
- sdk 升级 · 34d829cd
  zhiheng.zhang committed May 11, 2021
  
  34d829cd Browse Files