Commits · 4a779fc444011e8825243dc9e28c3ac755860bae · order-group-application / order-group · GitLab

24 Nov, 2020 17 commits
- merge · 4a779fc4
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  4a779fc4 Browse Files
- merge · 0fc54074
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  0fc54074 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 9739b9d2
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Nov 24, 2020
  9739b9d2 Browse Files
- 请至少选择一个可选商品 · 7704e9bf
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  7704e9bf Browse Files
- Merge branch 'feature/new-fixbig' into qa · 65d8353b
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Nov 24, 2020
  65d8353b Browse Files
- fix · f03c3ee7
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  f03c3ee7 Browse Files
- 升级购物车sdk · 2e984e6d
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  2e984e6d Browse Files
- Merge branch 'feature/new-fixbig' into qa · 9cbc1cc1
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  9cbc1cc1 Browse Files
- fix:套餐历史bug · b303a1a8
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  b303a1a8 Browse Files
- Merge branch 'feature/new-fixbig' into qa · cb545df5
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  cb545df5 Browse Files
- fix · 8ce0a122
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  8ce0a122 Browse Files
- Merge branch 'feature/new-fixbig' into qa · 535dce57
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  535dce57 Browse Files
- debug · c68750a7
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  c68750a7 Browse Files
- merge · ad387cf5
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  ad387cf5 Browse Files
- Merge remote-tracking branch 'origin/feature/2.05-商品券支持多商品' into qa · ff36c2a7
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  xiaoer.li@freemud.com committed Nov 24, 2020
  ff36c2a7 Browse Files
- Merge branch 'feature/20201123-svc卡券核销fix-lcf' into qa · df35a384
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  chongfu.liang committed Nov 24, 2020
  df35a384 Browse Files
- Merge branch 'feature/new-fixbig' into qa · ec0a8e67
  xiaoer.li@freemud.com committed Nov 24, 2020
  
  ec0a8e67 Browse Files
23 Nov, 2020 23 commits
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · d94e1241
  yu.sun committed Nov 23, 2020
  
  d94e1241 Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into qa · aeeb16f5
  chongfu.liang committed Nov 23, 2020
  
  aeeb16f5 Browse Files
- 修改商品id和名称 · 46fbc758
  chongfu.liang committed Nov 23, 2020
  
  46fbc758 Browse Files
- Merge branch '2020/11/3-买三赠一-huiyang' into qa · 391e2d1c
  孙昱 committed Nov 23, 2020
  
  391e2d1c Browse Files
- 买三赠一bug修复 · 63906dc9
  孙昱 committed Nov 23, 2020
  
  63906dc9 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · e2d62f67
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
```
  孙昱 committed Nov 23, 2020
  e2d62f67 Browse Files
- 套餐价格计算 · 008eb2fc
  孙昱 committed Nov 23, 2020
  
  008eb2fc Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into qa · af61e264
  yu.sun committed Nov 23, 2020
  
  af61e264 Browse Files
- sunyu::update::update about combox-product price calculate · 334ef13f
  yu.sun committed Nov 23, 2020
  
  334ef13f Browse Files
- 修改库存冲正逻辑 · 63dae486
  chongfu.liang committed Nov 23, 2020
  
  63dae486 Browse Files
- 套餐取finalPrice · 828558a0
  xiaoer.li@freemud.com committed Nov 23, 2020
  
  828558a0 Browse Files
- 升级sdk · d28ec7c7
  徐康 committed Nov 23, 2020
  
  d28ec7c7 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 5a523042
  徐康 committed Nov 23, 2020
  
  5a523042 Browse Files
- 权益卡金额 · 0ec414fd
  徐康 committed Nov 23, 2020
  
  0ec414fd Browse Files
- 恢复代码 · ec7d481f
  徐康 committed Nov 23, 2020
  
  ec7d481f Browse Files
- Revert "sdk版本回复" · 3fc5c902
```
This reverts commit 3f766143
```
  徐康 committed Nov 23, 2020
  3fc5c902 Browse Files
- fix · 2a36f3ff
  xiaoer.li@freemud.com committed Nov 23, 2020
  
  2a36f3ff Browse Files
- sunyu::update::update about combox-product price calculate · 5006ebb6
  yu.sun committed Nov 23, 2020
  
  5006ebb6 Browse Files
- sunyu::update::update about combox-product price calculate · 86995ec0
  yu.sun committed Nov 23, 2020
  
  86995ec0 Browse Files
- Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa · 47b0d975
  徐康 committed Nov 23, 2020
  
  47b0d975 Browse Files
- Merge branch 'bugfix/20201118_xukang_下单加锁防止重复下单' into qa · accb70b8
  徐康 committed Nov 23, 2020
  
  accb70b8 Browse Files
- 恢复代码 · 71994236
  徐康 committed Nov 23, 2020
  
  71994236 Browse Files
- 商品券重复加车校验和恢复代码 · b465bb38
  徐康 committed Nov 23, 2020
  
  b465bb38 Browse Files