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

04 Dec, 2020 22 commits
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · a61e7adb
  孙昱 committed Dec 04, 2020
  
  a61e7adb Browse Files
- sunyu::update::rollback calculate shopping-cart add goods · 372d54c7
  孙昱 committed Dec 04, 2020
  
  372d54c7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 6b622aed
  徐康 committed Dec 04, 2020
  
  6b622aed Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · ac881889
```
拼单购物车优惠金额修正

See merge request !36
```
  缪晖 committed Dec 04, 2020
  ac881889 Browse Files
- Merge branch 'bugfix/20201203_xukang_麦咖啡线上问题修复' into qa · 89996e2d
  徐康 committed Dec 04, 2020
  
  89996e2d Browse Files
- 优惠券替换普通商品问题 · dc2fb708
  徐康 committed Dec 04, 2020
  
  dc2fb708 Browse Files
- 拼单购物车优惠金额修正 · 6d10418e
  缪晖 committed Dec 04, 2020
  
  6d10418e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 75225e3d
  刘鹏飞 committed Dec 04, 2020
  
  75225e3d Browse Files
- coco返回的活动中剔除集点活动 · 29c13d73
  刘鹏飞 committed Dec 04, 2020
  
  29c13d73 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 0ea7ee77
  孙昱 committed Dec 04, 2020
  
  0ea7ee77 Browse Files
- sunyu::update::add new class shoppingCartMccafeAdapter for commbox-product calculate price · e3948c41
  孙昱 committed Dec 04, 2020
  
  e3948c41 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · eb5a3960
  孙昱 committed Dec 04, 2020
  
  eb5a3960 Browse Files
- sunyu::update::fixbug · abe84f02
  孙昱 committed Dec 04, 2020
  
  abe84f02 Browse Files
- Merge branch 'feature/20201204-1.0.10-加赠商品修改由行记录判断-lcf' into qa · 5cd68be8
  chongfu.liang committed Dec 04, 2020
  
  5cd68be8 Browse Files
- 升级sdk · 0555cd9d
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  0555cd9d Browse Files
- Merge branch 'feature/2.1.0_核销优惠券增加参数' into qa · 96bae7ec
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 04, 2020
  96bae7ec Browse Files
- 加赠商品修改 · 36c1fb8e
  chongfu.liang committed Dec 04, 2020
  
  36c1fb8e Browse Files
- Modify:带券订单下单成功直接锁券，支付完成核销 · 952c4dfd
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  952c4dfd Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 5b1f2b6f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 04, 2020
  5b1f2b6f Browse Files
- 购物车查询返回参数coco定制 · 372399fe
  刘鹏飞 committed Dec 04, 2020
  
  372399fe Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'qa' · a11c56e8
```
修改拼单完成之后失效时间1分钟

See merge request !34
```
  缪晖 committed Dec 04, 2020
  a11c56e8 Browse Files
- 修改拼单完成之后失效时间1分钟 · 1970bc66
  缪晖 committed Dec 04, 2020
  
  1970bc66 Browse Files
03 Dec, 2020 18 commits
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · b7344fc1
  孙昱 committed Dec 03, 2020
  
  b7344fc1 Browse Files
- sunyu::update::fix bug about add singleSpec product to multipleSpec product · b4954e8e
  孙昱 committed Dec 03, 2020
  
  b4954e8e Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · 91ce7bc9
  孙昱 committed Dec 03, 2020
  
  91ce7bc9 Browse Files
- sunyu::update::fix bug about combox-product price calculate · 24654fa6
  孙昱 committed Dec 03, 2020
  
  24654fa6 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group · 93835de2
  张洪旺 committed Dec 03, 2020
  
  93835de2 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 5ff2597f
  刘鹏飞 committed Dec 03, 2020
  
  5ff2597f Browse Files
- coco订单详情赠品要合并到主商品 · 81d15b3d
  刘鹏飞 committed Dec 03, 2020
  
  81d15b3d Browse Files
- Merge branch '20201127_coco配送进程' into qa · 84c729d6
  邓杰 committed Dec 03, 2020
  
  84c729d6 Browse Files
- 合并 · fb393951
  邓杰 committed Dec 03, 2020
  
  fb393951 Browse Files
- 合并 · 6fa48ed0
  邓杰 committed Dec 03, 2020
  
  6fa48ed0 Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · a7246be6
  孙昱 committed Dec 03, 2020
  
  a7246be6 Browse Files
- sunyu::fix bug::fix bug about add singleSpec-product to multipleSpec product · aea4eb17
  孙昱 committed Dec 03, 2020
  
  aea4eb17 Browse Files
- 创建订单查询购物车增加购物车行返回 · 9379c4d4
  刘鹏飞 committed Dec 03, 2020
  
  9379c4d4 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 7ba4cf3e
  孙昱 committed Dec 03, 2020
  
  7ba4cf3e Browse Files
- Merge branch 'feature/20201125_多规格商品下添加单规格商品_yu.sun' into qa · 8182f851
  孙昱 committed Dec 03, 2020
  
  8182f851 Browse Files
- sunyu::fixbug::fix bug about singleSpec-product and multipleSpec-product add to shoppingCart · 6b6b1dc4
  yu.sun committed Dec 03, 2020
  
  6b6b1dc4 Browse Files
- Merge remote-tracking branch 'origin/feature/fix-混合支付优化券核销' · d8cab34d
  xiaoer.li@freemud.com committed Dec 03, 2020
  
  d8cab34d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into qa · 0d65d727
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  缪晖 committed Dec 03, 2020
  0d65d727 Browse Files