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

09 Dec, 2020 12 commits
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 9a1e52d6
  孙昱 committed Dec 09, 2020
  
  9a1e52d6 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 2bc85ff7
  孙昱 committed Dec 09, 2020
  
  2bc85ff7 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 644658f1
  孙昱 committed Dec 09, 2020
  
  644658f1 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 753e3919
  孙昱 committed Dec 09, 2020
  
  753e3919 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · de7f9800
  刘鹏飞 committed Dec 09, 2020
  
  de7f9800 Browse Files
- coco打活动标签问题 · 677f66dd
  刘鹏飞 committed Dec 09, 2020
  
  677f66dd Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into qa · 6822d6b5
  chongfu.liang committed Dec 09, 2020
  
  6822d6b5 Browse Files
- fix · b2c9be86
  chongfu.liang committed Dec 09, 2020
  
  b2c9be86 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · f9aafcd3
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
```
  chongfu.liang committed Dec 09, 2020
  f9aafcd3 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · ac8e53c5
  孙昱 committed Dec 09, 2020
  
  ac8e53c5 Browse Files
- sunyu::conflicts::rollback about combo-product price calculate · 92ffecc8
  孙昱 committed Dec 09, 2020
  
  92ffecc8 Browse Files
- coco创单验证券去掉多余的errcode · 15fa28b1
  刘鹏飞 committed Dec 09, 2020
  
  15fa28b1 Browse Files
08 Dec, 2020 28 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 9bae89a6
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  刘鹏飞 committed Dec 08, 2020
  9bae89a6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 47e04a7b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  刘鹏飞 committed Dec 08, 2020
  47e04a7b Browse Files
- coco验证券失败errcode · 39a4ff0e
  刘鹏飞 committed Dec 08, 2020
  
  39a4ff0e Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 9a517e24
  刘鹏飞 committed Dec 08, 2020
  
  9a517e24 Browse Files
- coco验证券 · 624ea801
  刘鹏飞 committed Dec 08, 2020
  
  624ea801 Browse Files
- coco创单验证券 · 0df64af7
  刘鹏飞 committed Dec 08, 2020
  
  0df64af7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 3c611c5d
  刘鹏飞 committed Dec 08, 2020
  
  3c611c5d Browse Files
- coco去掉日志 · 0e241039
  刘鹏飞 committed Dec 08, 2020
  
  0e241039 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · e231f8d7
  刘鹏飞 committed Dec 08, 2020
  
  e231f8d7 Browse Files
- coco批量使用优惠券的时候，要有顺序 · 13d8b1f6
  刘鹏飞 committed Dec 08, 2020
  
  13d8b1f6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c2fc9fef
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Dec 08, 2020
  c2fc9fef Browse Files
- coco半价行要去除关联主行的商品id · 56c89ccb
  刘鹏飞 committed Dec 08, 2020
  
  56c89ccb Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · b5b2adbf
  孙昱 committed Dec 08, 2020
  
  b5b2adbf Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 678cd3cc
  孙昱 committed Dec 08, 2020
  
  678cd3cc Browse Files
- coco批量使用优惠券需要有下标 · 6e6fe346
  刘鹏飞 committed Dec 08, 2020
  
  6e6fe346 Browse Files
- fix coco商户配置 · 07de37af
  张洪旺 committed Dec 08, 2020
  
  07de37af Browse Files
- fix coco商户配置 · 068cee14
  张洪旺 committed Dec 08, 2020
  
  068cee14 Browse Files
- Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · 0f778cde
  张洪旺 committed Dec 08, 2020
  
  0f778cde Browse Files
- fix coco商户配置 · 599c9f7d
  张洪旺 committed Dec 08, 2020
  
  599c9f7d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa · c6048746
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
```
  缪晖 committed Dec 08, 2020
  c6048746 Browse Files
- 买赠商品挂靠购物车行逻辑调整 · 75a3489a
  缪晖 committed Dec 08, 2020
  
  75a3489a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 0f13bc7c
  刘鹏飞 committed Dec 08, 2020
  
  0f13bc7c Browse Files
- coco半价行、赠品行所关联的主商品行都不要商品id · cfce4c7e
  刘鹏飞 committed Dec 08, 2020
  
  cfce4c7e Browse Files
- Merge branch 'feature/2.0.9-购物车检查券是否可用' into qa · a25c77a1
  chongfu.liang committed Dec 08, 2020
  
  a25c77a1 Browse Files
- 修改校验逻辑 · 88b0ef45
  chongfu.liang committed Dec 08, 2020
  
  88b0ef45 Browse Files
- Update BuySendPromotionService.java · 89b153ab
  缪晖 committed Dec 08, 2020
  
  89b153ab Browse Files
- 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