Commits · d44bb53950931689fa28878b837df484ab4c47e0 · order-group-application / order-group

24 Dec, 2020 22 commits
- Merge remote-tracking branch 'origin/qa' into qa · d44bb539
  hanghang.wang committed Dec 24, 2020
  
  d44bb539 Browse Files
- 抖音支付新增抖音Id和openId · b606cfd1
  张志恒 committed Dec 24, 2020
  
  b606cfd1 Browse Files
- Merge branch 'feature/2020-12-14_order-group_wanghanghang' into qa · 169eb68e
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  hanghang.wang committed Dec 24, 2020
  169eb68e Browse Files
- Merge branch 'feature/20201217_四个非常搭套餐需求_yu.sun' into qa · 2eb71304
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartMccafeAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
```
  yu.sun committed Dec 24, 2020
  2eb71304 Browse Files
- Merge branch 'coco20201223-bug-zhw' of… · 6b31769c
```
Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa
```
  张洪旺 committed Dec 24, 2020
  6b31769c Browse Files
- fix 首日积点Bug · 0ef61cbc
  张洪旺 committed Dec 24, 2020
  
  0ef61cbc Browse Files
- sunyu::update::update about productGroup add Mateial about price calculate · e91adf87
  yu.sun committed Dec 24, 2020
  
  e91adf87 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · e7cf567a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 24, 2020
  e7cf567a Browse Files
- Merge branch 'coco20201223-bug-zhw' of… · 0c76b274
```
Merge branch 'coco20201223-bug-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 24, 2020
  0c76b274 Browse Files
- fix 首日积点Bug · 0315337e
  张洪旺 committed Dec 24, 2020
  
  0315337e Browse Files
- Merge remote-tracking branch 'origin/feature/coco_three' into qa · 35eabe2e
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
```
  刘鹏飞 committed Dec 24, 2020
  35eabe2e Browse Files
- coco将配送费放到一个字段 · bfc75b6b
  刘鹏飞 committed Dec 24, 2020
  
  bfc75b6b Browse Files
- Merge branch 'feature/20201223_用户订单查询促销信息转为payGiftReps_wanghanghang' into qa · daf51310
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/Orderservice.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  hanghang.wang committed Dec 24, 2020
  daf51310 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3df04818
  zhiheng.zhang committed Dec 24, 2020
  
  3df04818 Browse Files
- Merge branch 'feature/20201211-集点改造活动三期-张志恒' into qa · 1668930f
  zhiheng.zhang committed Dec 24, 2020
  
  1668930f Browse Files
- 老促销添加是否是全门店使用 · 12202efa
  zhiheng.zhang committed Dec 24, 2020
  
  12202efa Browse Files
- 注释新增促销字段，改为对象传参 · 25955a38
  hanghang.wang committed Dec 24, 2020
  
  25955a38 Browse Files
- 促销返回参数对象 20201223 提出紧急需求变更 · 4304bff9
  hanghang.wang committed Dec 24, 2020
  
  4304bff9 Browse Files
- 20201223 1322行变更-》去掉set，直接以对象进行返参 · 4d33314d
  hanghang.wang committed Dec 24, 2020
  
  4d33314d Browse Files
- 富友 · 0a29b3a4
  chongfu.liang committed Dec 24, 2020
  
  0a29b3a4 Browse Files
- 加点日志 · 7cda9577
  刘鹏飞 committed Dec 24, 2020
  
  7cda9577 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' · 3110ca79
  刘鹏飞 committed Dec 24, 2020
  
  3110ca79 Browse Files
23 Dec, 2020 18 commits
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 0398f659
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/CocoCouponRelationServiceImpl.java
```
  刘鹏飞 committed Dec 23, 2020
  0398f659 Browse Files
- coco核销优惠券整单优惠券 · 1d7682f9
  刘鹏飞 committed Dec 23, 2020
  
  1d7682f9 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 3810302d
  刘鹏飞 committed Dec 23, 2020
  
  3810302d Browse Files
- coco核销优惠券整单优惠券 · 09cc0dca
  刘鹏飞 committed Dec 23, 2020
  
  09cc0dca Browse Files
- 加点日志 · 0b970188
  刘鹏飞 committed Dec 23, 2020
  
  0b970188 Browse Files
- 加点日志 · f1718bfc
  刘鹏飞 committed Dec 23, 2020
  
  f1718bfc Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · c510c0f3
  刘鹏飞 committed Dec 23, 2020
  
  c510c0f3 Browse Files
- coco核销优惠券整单优惠券 · 541c067a
  刘鹏飞 committed Dec 23, 2020
  
  541c067a Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 1dd93e32
  刘鹏飞 committed Dec 23, 2020
  
  1dd93e32 Browse Files
- coco核销优惠券整单优惠券 · dbaac3cb
  刘鹏飞 committed Dec 23, 2020
  
  dbaac3cb Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 37c31995
  刘鹏飞 committed Dec 23, 2020
  
  37c31995 Browse Files
- coco核销优惠券整单优惠券,日志 · 2799895e
  刘鹏飞 committed Dec 23, 2020
  
  2799895e Browse Files
- 修改个版本代码 · df8cd70d
  刘鹏飞 committed Dec 23, 2020
  
  df8cd70d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 49677783
  刘鹏飞 committed Dec 23, 2020
  
  49677783 Browse Files
- Merge remote-tracking branch 'origin/feature/coco_new-刘鹏飞' into qa · 46c00dfe
  刘鹏飞 committed Dec 23, 2020
  
  46c00dfe Browse Files
- coco核销优惠券整单优惠券 · 638eda85
  刘鹏飞 committed Dec 23, 2020
  
  638eda85 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 10ff0ae0
  chongfu.liang committed Dec 23, 2020
  
  10ff0ae0 Browse Files
- 加些日志 · 486f56ca
  刘鹏飞 committed Dec 23, 2020
  
  486f56ca Browse Files