Commits · 845d9115da8f1dd002bd00981f4ed271287944a2 · order-group-application / order-group · GitLab

09 Dec, 2020 40 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 845d9115
```
包装费透传问题

See merge request !75
```
  缪晖 committed Dec 10, 2020
  845d9115 Browse Files
- 包装费透传问题 · e107cb62
  缪晖 committed Dec 10, 2020
  
  e107cb62 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 632ad43f
```
直接从促销goods获取均摊总优惠金额

See merge request !73
```
  缪晖 committed Dec 10, 2020
  632ad43f Browse Files
- 直接从促销goods获取均摊总优惠金额 · 3a4a7525
  缪晖 committed Dec 10, 2020
  
  3a4a7525 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · debe06cc
```
Update TimeSalePromotionService.java

See merge request !72
```
  缪晖 committed Dec 09, 2020
  debe06cc Browse Files
- Update TimeSalePromotionService.java · 967ad5ee
  缪晖 committed Dec 09, 2020
  
  967ad5ee Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 79625d9c
```
Update ShoppingCartCollageServiceImpl.java

See merge request !70
```
  缪晖 committed Dec 09, 2020
  79625d9c Browse Files
- Update ShoppingCartCollageServiceImpl.java · 28ba4084
  缪晖 committed Dec 09, 2020
  
  28ba4084 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 137bf983
  刘鹏飞 committed Dec 09, 2020
  
  137bf983 Browse Files
- coco现单价使用促销的价格 · 51933f8a
  刘鹏飞 committed Dec 09, 2020
  
  51933f8a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · a67b25ab
  刘鹏飞 committed Dec 09, 2020
  
  a67b25ab Browse Files
- coco现价使用促销返回的价格 · 2a737785
  刘鹏飞 committed Dec 09, 2020
  
  2a737785 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · c2bc8e14
```
重新计算购物车行优惠信息

See merge request !69
```
  缪晖 committed Dec 09, 2020
  c2bc8e14 Browse Files
- 重新计算购物车行优惠信息 · 8331e3f2
  缪晖 committed Dec 09, 2020
  
  8331e3f2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 809cde27
  刘鹏飞 committed Dec 09, 2020
  
  809cde27 Browse Files
- coco商品现单价使用促销返回的价格 · f12264c0
  刘鹏飞 committed Dec 09, 2020
  
  f12264c0 Browse Files
- coco字段判断 · 10eceb87
  刘鹏飞 committed Dec 09, 2020
  
  10eceb87 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 91ec3d82
  孙昱 committed Dec 09, 2020
  
  91ec3d82 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 50068762
  孙昱 committed Dec 09, 2020
  
  50068762 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 605995f0
  刘鹏飞 committed Dec 09, 2020
  
  605995f0 Browse Files
- coco去掉日志 · 3e5c97d2
  刘鹏飞 committed Dec 09, 2020
  
  3e5c97d2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · d991dd08
  刘鹏飞 committed Dec 09, 2020
  
  d991dd08 Browse Files
- coco添加日志 · f0587fb8
  刘鹏飞 committed Dec 09, 2020
  
  f0587fb8 Browse Files
- coco加点日志 · 9ed05528
  刘鹏飞 committed Dec 09, 2020
  
  9ed05528 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 7739c725
```
拼单状态补充

See merge request !68
```
  缪晖 committed Dec 09, 2020
  7739c725 Browse Files
- 拼单状态补充 · 31690b06
  缪晖 committed Dec 09, 2020
  
  31690b06 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · e3c677e9
```
Update CollageOrderController.java

See merge request !67
```
  缪晖 committed Dec 09, 2020
  e3c677e9 Browse Files
- Update CollageOrderController.java · c19b8cc7
  缪晖 committed Dec 09, 2020
  
  c19b8cc7 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · aa7c1662
```
混合支付判断拼单状态

See merge request !65
```
  缪晖 committed Dec 09, 2020
  aa7c1662 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 1cbf95cd
  孙昱 committed Dec 09, 2020
  
  1cbf95cd Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 6eaa5a06
  孙昱 committed Dec 09, 2020
  
  6eaa5a06 Browse Files
- 混合支付判断拼单状态 · a1bc6d26
  缪晖 committed Dec 09, 2020
  
  a1bc6d26 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · bb0760ab
  chongfu.liang committed Dec 09, 2020
  
  bb0760ab Browse Files
- 价格不校验 · b179412e
  chongfu.liang committed Dec 09, 2020
  
  b179412e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 2be81aeb
  刘鹏飞 committed Dec 09, 2020
  
  2be81aeb Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · bc604dd7
  孙昱 committed Dec 09, 2020
  
  bc604dd7 Browse Files
- sunyu::conflicts::rollback about combo-product price calculate · a2dd136f
  孙昱 committed Dec 09, 2020
  
  a2dd136f Browse Files
- 配送进程 · 5e8725dc
  邓杰 committed Dec 09, 2020
  
  5e8725dc Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 50d6340d
  孙昱 committed Dec 09, 2020
  
  50d6340d Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 5cb4dcb7
  孙昱 committed Dec 09, 2020
  
  5cb4dcb7 Browse Files