Commits · 9e9015d58cd93227ff2a9f6a7435ae7c8d4a0134 · order-group-application / order-group · GitLab

05 Dec, 2020 9 commits
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 9e9015d5
  孙昱 committed Dec 05, 2020
  
  9e9015d5 Browse Files
- sunyu::update::fix bug about combo-product price calculate · 34275a17
  孙昱 committed Dec 05, 2020
  
  34275a17 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 2828e7ba
  孙昱 committed Dec 05, 2020
  
  2828e7ba Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 228dbb6a
  孙昱 committed Dec 05, 2020
  
  228dbb6a Browse Files
- sunyu::fixbug::fix bug about combo-product calculate price · 25581b00
  孙昱 committed Dec 05, 2020
  
  25581b00 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · f0fc5847
  刘鹏飞 committed Dec 05, 2020
  
  f0fc5847 Browse Files
- coco活动集合剔除集点活动展示 · 51d35b75
  刘鹏飞 committed Dec 05, 2020
  
  51d35b75 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 91a49527
```
Update CollageOrderServiceImpl.java

See merge request !40
```
  缪晖 committed Dec 05, 2020
  91a49527 Browse Files
- Update CollageOrderServiceImpl.java · 2e3555a4
  缪晖 committed Dec 05, 2020
  
  2e3555a4 Browse Files
04 Dec, 2020 31 commits
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 0a3ad6fa
  孙昱 committed Dec 05, 2020
  
  0a3ad6fa Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · bcadd874
  孙昱 committed Dec 05, 2020
  
  bcadd874 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 637a27cb
  孙昱 committed Dec 05, 2020
  
  637a27cb Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 772281d7
  孙昱 committed Dec 05, 2020
  
  772281d7 Browse Files
- sunyu::add log about checkRequest · 2ff05768
  孙昱 committed Dec 05, 2020
  
  2ff05768 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 8d7ae293
  孙昱 committed Dec 05, 2020
  
  8d7ae293 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 1379fa73
  孙昱 committed Dec 05, 2020
  
  1379fa73 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 7e30c21f
  孙昱 committed Dec 05, 2020
  
  7e30c21f Browse Files
- sunyu::update::fix bug about combo-product calculate price · 57181980
  孙昱 committed Dec 05, 2020
  
  57181980 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 2b06d8b2
  yu.sun committed Dec 05, 2020
  
  2b06d8b2 Browse Files
- sunyu::fix bug about combo-product calculate price · 018097c8
  yu.sun committed Dec 05, 2020
  
  018097c8 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 040825ca
  yu.sun committed Dec 05, 2020
  
  040825ca Browse Files
- sunyu::fix bug about combo-product calculate price · 370a4faf
  yu.sun committed Dec 05, 2020
  
  370a4faf Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 5f1c08af
  yu.sun committed Dec 05, 2020
  
  5f1c08af Browse Files
- sunyu::fix bug about combo-product calculate price · 5afe39ea
  yu.sun committed Dec 05, 2020
  
  5afe39ea Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 78ab49e0
  yu.sun committed Dec 05, 2020
  
  78ab49e0 Browse Files
- sunyu::fix bug about combo-product calculate price · 8049cdd1
  yu.sun committed Dec 05, 2020
  
  8049cdd1 Browse Files
- 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