Commits · 83f10ca43a3cb9513c4ce6a414b7c2220ba88417 · order-group-application / order-group · GitLab

04 Dec, 2020 40 commits
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 83f10ca4
  yu.sun committed Dec 05, 2020
  
  83f10ca4 Browse Files
- sunyu::fix bug about combo-product calculate price · 049cc33a
  yu.sun committed Dec 05, 2020
  
  049cc33a Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 5962cdf0
  yu.sun committed Dec 04, 2020
  
  5962cdf0 Browse Files
- sunyu::fix bug about combo-product calculate · 2a722b73
  yu.sun committed Dec 04, 2020
  
  2a722b73 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 607685e5
  yu.sun committed Dec 04, 2020
  
  607685e5 Browse Files
- sunyu::rollback calculate · c5af05c4
  yu.sun committed Dec 04, 2020
  
  c5af05c4 Browse Files
- sunyu::resolve conflicts · 2f4681b4
  yu.sun committed Dec 04, 2020
  
  2f4681b4 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · da4b4aad
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
```
  yu.sun committed Dec 04, 2020
  da4b4aad Browse Files
- sunyu::fixbug::fix bug about combox-product price calculate · 14a4aa9b
  yu.sun committed Dec 04, 2020
  
  14a4aa9b Browse Files
- sunyu::conflicts::resolve code conflicts · 95d0b30b
  yu.sun committed Dec 04, 2020
  
  95d0b30b Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 4fc44f6a
```
运费均摊计算公式调整

See merge request !38
```
  缪晖 committed Dec 04, 2020
  4fc44f6a Browse Files
- 运费均摊计算公式调整 · e4aa70af
  缪晖 committed Dec 04, 2020
  
  e4aa70af Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · ab493ea0
  刘鹏飞 committed Dec 04, 2020
  
  ab493ea0 Browse Files
- coco下单时间检查，增加时间的null判断 · 4bca1c93
  刘鹏飞 committed Dec 04, 2020
  
  4bca1c93 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 7efc087d
  孙昱 committed Dec 04, 2020
  
  7efc087d Browse Files
- sunyu::fix bug ::fix bug about combox-product price calculate · e6f22f2a
  孙昱 committed Dec 04, 2020
  
  e6f22f2a Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 8857fdbc
  孙昱 committed Dec 04, 2020
  
  8857fdbc Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · b9ef4d48
  孙昱 committed Dec 04, 2020
  
  b9ef4d48 Browse Files
- sunyu::update::fix bug about SET_MEAL_GOODS price calculate · 82af2351
  孙昱 committed Dec 04, 2020
  
  82af2351 Browse Files
- 抖音支付新增抖音Id和openId · 32453178
  张志恒 committed Dec 04, 2020
  
  32453178 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · cf7678a9
  张志恒 committed Dec 04, 2020
  
  cf7678a9 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 5f37709b
  张洪旺 committed Dec 04, 2020
  
  5f37709b Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · a61e7adb
  孙昱 committed Dec 04, 2020
  
  a61e7adb Browse Files
- sunyu::update::rollback calculate shopping-cart add goods · 372d54c7
  孙昱 committed Dec 04, 2020
  
  372d54c7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6828563e
  张洪旺 committed Dec 04, 2020
  
  6828563e Browse Files
- Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · 7fa1887d
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SubscribeMessageRequest.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
```
  张洪旺 committed Dec 04, 2020
  7fa1887d Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6b622aed
  徐康 committed Dec 04, 2020
  
  6b622aed Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · ac881889
```
拼单购物车优惠金额修正

See merge request !36
```
  缪晖 committed Dec 04, 2020
  ac881889 Browse Files
- Merge branch 'bugfix/20201203_xukang_麦咖啡线上问题修复' into qa · 89996e2d
  徐康 committed Dec 04, 2020
  
  89996e2d Browse Files
- 优惠券替换普通商品问题 · dc2fb708
  徐康 committed Dec 04, 2020
  
  dc2fb708 Browse Files
- 拼单购物车优惠金额修正 · 6d10418e
  缪晖 committed Dec 04, 2020
  
  6d10418e Browse Files
- 都因小程序新增抖音返回字段 · 8cb765cb
  张志恒 committed Dec 04, 2020
  
  8cb765cb Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 75225e3d
  刘鹏飞 committed Dec 04, 2020
  
  75225e3d Browse Files
- coco返回的活动中剔除集点活动 · 29c13d73
  刘鹏飞 committed Dec 04, 2020
  
  29c13d73 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 0ea7ee77
  孙昱 committed Dec 04, 2020
  
  0ea7ee77 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · e3948c41
  孙昱 committed Dec 04, 2020
  
  e3948c41 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · eb5a3960
  孙昱 committed Dec 04, 2020
  
  eb5a3960 Browse Files
- sunyu::update::fixbug · abe84f02
  孙昱 committed Dec 04, 2020
  
  abe84f02 Browse Files
- Merge branch 'feature/20201204-1.0.10-加赠商品修改由行记录判断-lcf' into qa · 5cd68be8
  chongfu.liang committed Dec 04, 2020
  
  5cd68be8 Browse Files
- 升级sdk · 0555cd9d
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  0555cd9d Browse Files