Commits · 5a3bc33f2e28172e76d3b5310d88ed1a55b818ca · order-group-application / order-group · GitLab

07 Dec, 2020 10 commits
- Merge remote-tracking branch 'origin/qa' into qa · 5a3bc33f
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  5a3bc33f Browse Files
- Merge branch 'feature/混合支付增加门店名称' into qa · b55771a9
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  b55771a9 Browse Files
- 混合支付增加门店名称 · c0ba56ad
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  c0ba56ad Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 04ed3f5f
  刘鹏飞 committed Dec 07, 2020
  
  04ed3f5f Browse Files
- coco针对第二件优惠活动，优惠商品要换行 · 467db42c
  刘鹏飞 committed Dec 07, 2020
  
  467db42c Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa · 36e631e2
  徐康 committed Dec 07, 2020
  
  36e631e2 Browse Files
- 退款回调 · aaf75412
  徐康 committed Dec 07, 2020
  
  aaf75412 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · a7d28787
  徐康 committed Dec 07, 2020
  
  a7d28787 Browse Files
- 餐道价格 · 6c9a9c84
  徐康 committed Dec 07, 2020
  
  6c9a9c84 Browse Files
- 退款回调 · dc6b60ff
  徐康 committed Dec 07, 2020
  
  dc6b60ff Browse Files
05 Dec, 2020 26 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · b9668bcc
```
Update ShoppingCartCollageServiceImpl.java

See merge request !48
```
  缪晖 committed Dec 05, 2020
  b9668bcc Browse Files
- Update ShoppingCartCollageServiceImpl.java · caf094dc
  缪晖 committed Dec 05, 2020
  
  caf094dc Browse Files
- Update ShoppingCartCollageServiceImpl.java · 75a15b59
  缪晖 committed Dec 05, 2020
  
  75a15b59 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 0d8dcd8c
```
合车逻辑修正

See merge request !46
```
  缪晖 committed Dec 05, 2020
  0d8dcd8c Browse Files
- 合车逻辑修正 · 0889273c
  缪晖 committed Dec 05, 2020
  
  0889273c Browse Files
- 合车判断条件修正 · bc5f464b
  缪晖 committed Dec 05, 2020
  
  bc5f464b Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 82f6496c
  徐康 committed Dec 05, 2020
  
  82f6496c Browse Files
- 套餐价格 · 1344b16f
  徐康 committed Dec 05, 2020
  
  1344b16f Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 2be0bef5
```
个人购物车将个人数据覆盖整单数据

See merge request !44
```
  缪晖 committed Dec 05, 2020
  2be0bef5 Browse Files
- 个人购物车将个人数据覆盖整单数据 · 2683568d
  缪晖 committed Dec 05, 2020
  
  2683568d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 87ff58a0
  刘鹏飞 committed Dec 05, 2020
  
  87ff58a0 Browse Files
- coco赠品合并到主商品行 · a59a631f
  刘鹏飞 committed Dec 05, 2020
  
  a59a631f Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 85a6fcf2
  徐康 committed Dec 05, 2020
  
  85a6fcf2 Browse Files
- 使用购物车套餐价格 · f39d88f9
  徐康 committed Dec 05, 2020
  
  f39d88f9 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 1d18cbe7
  孙昱 committed Dec 05, 2020
  
  1d18cbe7 Browse Files
- 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 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 552d25ec
```
个人购物车隐藏满减提示

See merge request !43
```
  缪晖 committed Dec 05, 2020
  552d25ec Browse Files
- 个人购物车隐藏满减提示 · 6a13d4a9
  缪晖 committed Dec 05, 2020
  
  6a13d4a9 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 4 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