Commits · 2c840a72b89eeb78583992552ea910c420c3759c · order-group-application / order-group · GitLab

21 Oct, 2020 40 commits
- sunyu::update::fix bug about copyOrder skuName · 2c840a72
  yu.sun committed Oct 21, 2020
  
  2c840a72 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c26ef888
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  c26ef888 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · d72d6066
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  d72d6066 Browse Files
- fix:促销券类型判断 · bcd5eff8
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  bcd5eff8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 0efdf162
  徐康 committed Oct 21, 2020
  
  0efdf162 Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · e14ad0d8
  徐康 committed Oct 21, 2020
  
  e14ad0d8 Browse Files
- 随单购 · 439a14b2
  徐康 committed Oct 21, 2020
  
  439a14b2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 95f48a92
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  95f48a92 Browse Files
- fix:促销券类型判断 · 70f564dc
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  70f564dc Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b7cb5ec9
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  b7cb5ec9 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · a4f86ce2
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  a4f86ce2 Browse Files
- fix:促销券类型判断 · c6242af4
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  c6242af4 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 2d0de4f1
  徐康 committed Oct 21, 2020
  
  2d0de4f1 Browse Files
- 随单购 · 9a2ff335
  徐康 committed Oct 21, 2020
  
  9a2ff335 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 8c35e557
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  8c35e557 Browse Files
- fix:促销券类型判断 · 511c380a
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  511c380a Browse Files
- 万能券入机 · 7acc3688
  徐康 committed Oct 21, 2020
  
  7acc3688 Browse Files
- Merge branch ''bugfix/20201020_线上问题修复_xukang'' into qa · cf58a732
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 21, 2020
  cf58a732 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 121bc2f2
  徐康 committed Oct 21, 2020
  
  121bc2f2 Browse Files
- 万能券入机 · ac137269
  徐康 committed Oct 21, 2020
  
  ac137269 Browse Files
- fix · 045f0caf
  huiyang.chen committed Oct 21, 2020
  
  045f0caf Browse Files
- 更新商品数量以后用保存的优惠券计算价格 · a768d5e8
  徐康 committed Oct 21, 2020
  
  a768d5e8 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into qa · fec89c0a
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  huiyang.chen committed Oct 21, 2020
  fec89c0a Browse Files
- fix 商品券入机修改 · 4e9a3b18
  huiyang.chen committed Oct 21, 2020
  
  4e9a3b18 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · c9e1b9e4
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  c9e1b9e4 Browse Files
- fix:套餐折扣 · 0f64ff90
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  0f64ff90 Browse Files
- fix:套餐折扣 · da5e7ae4
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  da5e7ae4 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 7831ed2d
  huiyang.chen committed Oct 21, 2020
  
  7831ed2d Browse Files
- fix · 6422026d
  huiyang.chen committed Oct 21, 2020
  
  6422026d Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · ac5ff196
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OldOrderAccountType.java
#	order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  huiyang.chen committed Oct 21, 2020
  ac5ff196 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 8f23b811
  yu.sun committed Oct 21, 2020
  
  8f23b811 Browse Files
- sunyu::update::fix bug about copyOrder to resolve comboxGods products info is empty · dae92150
  yu.sun committed Oct 21, 2020
  
  dae92150 Browse Files
- log · 0f4ed4c6
  huiyang.chen committed Oct 21, 2020
  
  0f4ed4c6 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into qa · 7f4a7daf
  huiyang.chen committed Oct 21, 2020
  
  7f4a7daf Browse Files
- log · 7e77e840
  huiyang.chen committed Oct 21, 2020
  
  7e77e840 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into qa · d7a33e63
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java
```
  huiyang.chen committed Oct 21, 2020
  d7a33e63 Browse Files
- 新增卡券类型字段fix · 301cf147
  huiyang.chen committed Oct 21, 2020
  
  301cf147 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · f0dbe7bd
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  f0dbe7bd Browse Files
- fix:重新合并代码 · 59fcb90d
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  59fcb90d Browse Files
- fix:重新合并代码 · 4b61b36f
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  4b61b36f Browse Files