Commits · cf58a7321a0b7c56197256311a52531e042fa60c · order-group-application / order-group

21 Oct, 2020 25 commits
- 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
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 918778ea
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/SetMealServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Oct 21, 2020
  918778ea Browse Files
- fix:券 · aa6af870
  xiaoer.li@freemud.com committed Oct 21, 2020
  
  aa6af870 Browse Files
20 Oct, 2020 15 commits
- sunyu::update::fix bug about copyOrder to resolve comboxGods products info is empty · f4789192
  yu.sun committed Oct 21, 2020
  
  f4789192 Browse Files
- 新增卡券类型字段fix · d2a435ce
  huiyang.chen committed Oct 21, 2020
  
  d2a435ce Browse Files
- 早餐非常搭 bugfix · a36f0ebb
  徐康 committed Oct 21, 2020
  
  a36f0ebb Browse Files
- 新增卡券类型字段 · c0b5fefd
  huiyang.chen committed Oct 21, 2020
  
  c0b5fefd Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · 27f8a739
  徐康 committed Oct 21, 2020
  
  27f8a739 Browse Files
- bugfix · b7d20e19
  徐康 committed Oct 21, 2020
  
  b7d20e19 Browse Files
- 新增卡券类型字段 · 3916e6e8
  huiyang.chen committed Oct 21, 2020
  
  3916e6e8 Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · ef624b0e
  yu.sun committed Oct 20, 2020
  
  ef624b0e Browse Files
- sunyu::reset commit · c88aae8c
  yu.sun committed Oct 20, 2020
  
  c88aae8c Browse Files
- Merge branch 'feature/20200929_麦咖啡再来一单' · f1d83636
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  yu.sun committed Oct 20, 2020
  f1d83636 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · 76bad00c
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 20, 2020
  76bad00c Browse Files
- 入参过滤 · c07e9c32
  徐康 committed Oct 20, 2020
  
  c07e9c32 Browse Files
- 万能券餐道优惠 · bd4c24bc
  徐康 committed Oct 20, 2020
  
  bd4c24bc Browse Files
- 万能券核销 · 3f29a37b
  徐康 committed Oct 20, 2020
  
  3f29a37b Browse Files
- 万能券核销 · 586e82f6
  徐康 committed Oct 20, 2020
  
  586e82f6 Browse Files