Commits · e53453ce8044403d788da6e95caa0c3713a144fb · order-group-application / order-group · GitLab

08 Dec, 2020 10 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa · e53453ce
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  缪晖 committed Dec 08, 2020
  e53453ce Browse Files
- 群收款金额扣除微信平台优惠及商户优惠 · 69c0e8a0
  缪晖 committed Dec 08, 2020
  
  69c0e8a0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · bbc4a8a1
  刘鹏飞 committed Dec 08, 2020
  
  bbc4a8a1 Browse Files
- 新促销空购物车满减提示语 · 55007b57
  刘鹏飞 committed Dec 08, 2020
  
  55007b57 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 1769651e
  刘鹏飞 committed Dec 08, 2020
  
  1769651e Browse Files
- coco如果有半价行，主行的activeType要设置为null · 6c912467
  刘鹏飞 committed Dec 08, 2020
  
  6c912467 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · f2def697
  刘鹏飞 committed Dec 08, 2020
  
  f2def697 Browse Files
- coco加点日志 · 0ae21921
  刘鹏飞 committed Dec 08, 2020
  
  0ae21921 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 566285f3
  刘鹏飞 committed Dec 08, 2020
  
  566285f3 Browse Files
- 当用户购物车为空的时候，调整满减提示语 · ae0a9553
  刘鹏飞 committed Dec 08, 2020
  
  ae0a9553 Browse Files
07 Dec, 2020 30 commits
- 限时特价及组合优惠修改 · 9ce4acdf
  缪晖 committed Dec 07, 2020
  
  9ce4acdf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · b2f65ffb
  刘鹏飞 committed Dec 07, 2020
  
  b2f65ffb Browse Files
- coco将半价商品放到后边显示 · f9a5bf3b
  刘鹏飞 committed Dec 07, 2020
  
  f9a5bf3b Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · aa12fe4c
  孙昱 committed Dec 07, 2020
  
  aa12fe4c Browse Files
- sunyu::update::fix bug about NPE · 830d18e1
  孙昱 committed Dec 07, 2020
  
  830d18e1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 0c8d1fa6
  刘鹏飞 committed Dec 07, 2020
  
  0c8d1fa6 Browse Files
- coco去掉日志 · 22780b18
  刘鹏飞 committed Dec 07, 2020
  
  22780b18 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · b073e8dc
  孙昱 committed Dec 07, 2020
  
  b073e8dc Browse Files
- sunyu::update::fix bug about NPE · c262860e
  孙昱 committed Dec 07, 2020
  
  c262860e Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 03f4d898
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  孙昱 committed Dec 07, 2020
  03f4d898 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · 87e55a19
```
群收款金额修复

See merge request !53
```
  缪晖 committed Dec 07, 2020
  87e55a19 Browse Files
- sunyu::update::fix bug about code conflicts · 0d556b3e
  孙昱 committed Dec 07, 2020
  
  0d556b3e Browse Files
- 群收款金额修复 · cc00472e
  缪晖 committed Dec 07, 2020
  
  cc00472e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 9d817b24
  刘鹏飞 committed Dec 07, 2020
  
  9d817b24 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into feature/20201112_套餐价格计算_yu.sun · 3310ad63
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  孙昱 committed Dec 07, 2020
  3310ad63 Browse Files
- coco加点日志 · 7b8193cc
  刘鹏飞 committed Dec 07, 2020
  
  7b8193cc Browse Files
- 添加日志 · 9995f90d
  刘鹏飞 committed Dec 07, 2020
  
  9995f90d Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · a6ff9570
  孙昱 committed Dec 07, 2020
  
  a6ff9570 Browse Files
- sunyu::update::fix bug about productService reponse code · 6a2cd0aa
  孙昱 committed Dec 07, 2020
  
  6a2cd0aa Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · cd74d0a0
```
Update ShoppingCartCollageServiceImpl.java

See merge request !52
```
  缪晖 committed Dec 07, 2020
  cd74d0a0 Browse Files
- Update ShoppingCartCollageServiceImpl.java · 55161e60
  缪晖 committed Dec 07, 2020
  
  55161e60 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 91b54330
  邓杰 committed Dec 07, 2020
  
  91b54330 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · 47230366
  徐康 committed Dec 07, 2020
  
  47230366 Browse Files
- 餐道价格 · be5f5445
  徐康 committed Dec 07, 2020
  
  be5f5445 Browse Files
- Merge branch '20201127_coco配送进程' into qa · f8655e9d
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  邓杰 committed Dec 07, 2020
  f8655e9d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 4e1e607d
  刘鹏飞 committed Dec 07, 2020
  
  4e1e607d Browse Files
- 加点日志 · 9bd3e682
  刘鹏飞 committed Dec 07, 2020
  
  9bd3e682 Browse Files
- 配送方式 · a865b0b6
  邓杰 committed Dec 07, 2020
  
  a865b0b6 Browse Files
- 加点日志 · c2162808
  刘鹏飞 committed Dec 07, 2020
  
  c2162808 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · d8468fb3
```
拼单新增加车时间，用于给促销调用进行商品排序

See merge request !50
```
  缪晖 committed Dec 07, 2020
  d8468fb3 Browse Files