Commits · 8d8a134a2fe5f9665cc779c7f9a1cbad7dec1a77 · order-group-application / order-group · GitLab

07 Dec, 2020 2 commits
- sunyu::conflicts::resolve merge code conflicts · 8d8a134a
  孙昱 committed Dec 07, 2020
  
  8d8a134a Browse Files
- sunyu::update::merge code · 508efe29
  孙昱 committed Dec 07, 2020
  
  508efe29 Browse Files
05 Dec, 2020 12 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · ec9aea7a
```
Update ShoppingCartCollageServiceImpl.java

See merge request !49
```
  缪晖 committed Dec 05, 2020
  ec9aea7a Browse Files
- Update ShoppingCartCollageServiceImpl.java · caf094dc
  缪晖 committed Dec 05, 2020
  
  caf094dc Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · c1cb50b0
```
合车逻辑修正

See merge request !47
```
  缪晖 committed Dec 05, 2020
  c1cb50b0 Browse Files
- 合车逻辑修正 · 0889273c
  缪晖 committed Dec 05, 2020
  
  0889273c Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 7d0bb42f
```
个人购物车将个人数据覆盖整单数据

See merge request !45
```
  缪晖 committed Dec 05, 2020
  7d0bb42f Browse Files
- 个人购物车将个人数据覆盖整单数据 · 2683568d
  缪晖 committed Dec 05, 2020
  
  2683568d Browse Files
- sunyu::update::fix bug about combo-product price calculate · 34275a17
  孙昱 committed Dec 05, 2020
  
  34275a17 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · dcb2a4df
```
个人购物车隐藏满减提示

See merge request !42
```
  缪晖 committed Dec 05, 2020
  dcb2a4df Browse Files
- 个人购物车隐藏满减提示 · 6a13d4a9
  缪晖 committed Dec 05, 2020
  
  6a13d4a9 Browse Files
- sunyu::fixbug::fix bug about combo-product calculate price · 25581b00
  孙昱 committed Dec 05, 2020
  
  25581b00 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 58552dc3
```
Update CollageOrderServiceImpl.java

See merge request !41
```
  缪晖 committed Dec 05, 2020
  58552dc3 Browse Files
- Update CollageOrderServiceImpl.java · 2e3555a4
  缪晖 committed Dec 05, 2020
  
  2e3555a4 Browse Files
04 Dec, 2020 26 commits
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · bcadd874
  孙昱 committed Dec 05, 2020
  
  bcadd874 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 772281d7
  孙昱 committed Dec 05, 2020
  
  772281d7 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · 1379fa73
  孙昱 committed Dec 05, 2020
  
  1379fa73 Browse Files
- sunyu::update::fix bug about combo-product calculate price · 57181980
  孙昱 committed Dec 05, 2020
  
  57181980 Browse Files
- sunyu::fix bug about combo-product calculate price · 018097c8
  yu.sun committed Dec 05, 2020
  
  018097c8 Browse Files
- sunyu::fix bug about combo-product calculate price · 370a4faf
  yu.sun committed Dec 05, 2020
  
  370a4faf Browse Files
- sunyu::fix bug about combo-product calculate price · 5afe39ea
  yu.sun committed Dec 05, 2020
  
  5afe39ea Browse Files
- sunyu::fix bug about combo-product calculate price · 8049cdd1
  yu.sun committed Dec 05, 2020
  
  8049cdd1 Browse Files
- sunyu::fix bug about combo-product calculate price · 049cc33a
  yu.sun committed Dec 05, 2020
  
  049cc33a Browse Files
- sunyu::fix bug about combo-product calculate · 2a722b73
  yu.sun committed Dec 04, 2020
  
  2a722b73 Browse Files
- sunyu::rollback calculate · c5af05c4
  yu.sun committed Dec 04, 2020
  
  c5af05c4 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 'develop' · c353473b
```
运费均摊计算公式调整

See merge request !39
```
  缪晖 committed Dec 04, 2020
  c353473b Browse Files
- 运费均摊计算公式调整 · e4aa70af
  缪晖 committed Dec 04, 2020
  
  e4aa70af Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 3fc74cc0
  刘鹏飞 committed Dec 04, 2020
  
  3fc74cc0 Browse Files
- coco下单时间检查，增加时间的null判断 · 4bca1c93
  刘鹏飞 committed Dec 04, 2020
  
  4bca1c93 Browse Files
- sunyu::fix bug ::fix bug about combox-product price calculate · e6f22f2a
  孙昱 committed Dec 04, 2020
  
  e6f22f2a Browse Files
- sunyu::update::fix bug about SET_MEAL_GOODS price calculate · 82af2351
  孙昱 committed Dec 04, 2020
  
  82af2351 Browse Files
- 抖音支付新增抖音Id和openId · cc0d40dd
  张志恒 committed Dec 04, 2020
  
  cc0d40dd Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · 59c4a60f
  张志恒 committed Dec 04, 2020
  
  59c4a60f Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 8e8098bf
```
拼单购物车优惠金额修正

See merge request !37
```
  缪晖 committed Dec 04, 2020
  8e8098bf 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 develop · 23b8dda5
  刘鹏飞 committed Dec 04, 2020
  
  23b8dda5 Browse Files
- coco返回的活动中剔除集点活动 · 29c13d73
  刘鹏飞 committed Dec 04, 2020
  
  29c13d73 Browse Files