Commits · 0a48287c969de10c1dd4d119f77bafb8a7f0f2db · order-group-application / order-group

20 Oct, 2020 14 commits
- Merge branch 'feature-yu.sun-getCartInfoByUser-20200925' · 0a48287c
  yu.sun committed Oct 20, 2020
  
  0a48287c Browse Files
- 升级sdk · 09a73252
  徐康 committed Oct 20, 2020
  
  09a73252 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · 3b603b4a
  徐康 committed Oct 20, 2020
  
  3b603b4a Browse Files
- sunyu-促销计算 · c33f6f73
  徐康 committed Oct 20, 2020
  
  c33f6f73 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · fd7cfdf0
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 20, 2020
  fd7cfdf0 Browse Files
- 冲突 · 64938d3c
  huiyang.chen committed Oct 20, 2020
  
  64938d3c Browse Files
- Merge remote-tracking branch 'origin/master' · c7db3f42
  huiyang.chen committed Oct 20, 2020
  
  c7db3f42 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' · 7a2c5314
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/activity/ActivityDiscountsDto.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.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 20, 2020
  7a2c5314 Browse Files
- Merge remote-tracking branch 'remotes/origin/fixbug-setmeal' · 8ec3c3d6
  xiaoer.li@freemud.com committed Oct 20, 2020
  
  8ec3c3d6 Browse Files
- fix:去掉未参与活动时的提示 · fe9965b9
  xiaoer.li@freemud.com committed Oct 20, 2020
  
  fe9965b9 Browse Files
- Merge branch '2020/10/15-mccafeCoupon-huiyang' · 708a08dc
  huiyang.chen committed Oct 20, 2020
  
  708a08dc Browse Files
- fix:套餐数量限制 · fc99d400
  xiaoer.li@freemud.com committed Oct 20, 2020
  
  fc99d400 Browse Files
- fix:套餐数量限制 · 12cf18a8
  xiaoer.li@freemud.com committed Oct 20, 2020
  
  12cf18a8 Browse Files
- 获取保存的优惠券不校验是否可用 · 5c45f291
  徐康 committed Oct 20, 2020
  
  5c45f291 Browse Files
19 Oct, 2020 5 commits
- sunyu::fix bug about shopping-cart-info save to redis · 9066c677
  yu.sun committed Oct 19, 2020
  
  9066c677 Browse Files
- sunyu::fixbug::万能券和普通商品同时加车,购物车返回异常bug修复 · 2b33653f
  yu.sun committed Oct 19, 2020
  
  2b33653f Browse Files
- sunyu::update::fix bug about shopping-cart-info · e7d8fe20
  yu.sun committed Oct 19, 2020
  
  e7d8fe20 Browse Files
- 券批量查询参数更改 · 5199cd3f
  徐康 committed Oct 19, 2020
  
  5199cd3f Browse Files
- 加料下单商品类型 · e3b19661
  徐康 committed Oct 19, 2020
  
  e3b19661 Browse Files
15 Oct, 2020 7 commits
- Merge branch '2020/10/14-商品券-huiyang' into 2020/10/15-mccafeCoupon-huiyang · f4648599
  huiyang.chen committed Oct 15, 2020
  
  f4648599 Browse Files
- fixbug · b7f0be9c
  xiaoer.li@freemud.com committed Oct 15, 2020
  
  b7f0be9c Browse Files
- 麦咖啡多规格加料下单 · 3192a8b5
  徐康 committed Oct 15, 2020
  
  3192a8b5 Browse Files
- fix 多规格商品券 · 01e08146
  huiyang.chen committed Oct 15, 2020
  
  01e08146 Browse Files
- 运费券核销 · 497e89f5
  徐康 committed Oct 15, 2020
  
  497e89f5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' · ac05693d
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Oct 15, 2020
  ac05693d Browse Files
- fix · d786ff25
  xiaoer.li@freemud.com committed Oct 15, 2020
  
  d786ff25 Browse Files
14 Oct, 2020 10 commits
- 运费券核销 · 564a18e6
  徐康 committed Oct 14, 2020
  
  564a18e6 Browse Files
- fix 合并随单购 · df8a1489
  huiyang.chen committed Oct 14, 2020
  
  df8a1489 Browse Files
- fix · 8e238d13
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  8e238d13 Browse Files
- fix · c26a84ec
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  c26a84ec Browse Files
- 运费券核销 · 594b0e01
  徐康 committed Oct 14, 2020
  
  594b0e01 Browse Files
- fix · 00e99f2f
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  00e99f2f Browse Files
- fix · 99a0e2ca
  xiaoer.li@freemud.com committed Oct 14, 2020
  
  99a0e2ca Browse Files
- 运费减免 · ca198e92
  徐康 committed Oct 14, 2020
  
  ca198e92 Browse Files
- 运费券锁定与核销 · 7fdab400
  徐康 committed Oct 14, 2020
  
  7fdab400 Browse Files
- fix 支付时使用运费券 · 93ceb348
  huiyang.chen committed Oct 14, 2020
  
  93ceb348 Browse Files
13 Oct, 2020 4 commits
- sdk版本升级 · 8a98edc7
  zhiheng.zhang committed Oct 14, 2020
  
  8a98edc7 Browse Files
- Merge remote-tracking branch 'origin/master' · d3d38ddb
  zhiheng.zhang committed Oct 14, 2020
  
  d3d38ddb Browse Files
- Merge branch 'feature/2020/09/07-1.9.38-优惠信息入库-张志恒' · 947e1e7f
  zhiheng.zhang committed Oct 14, 2020
  
  947e1e7f Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of… · 5a559d1c
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Oct 14, 2020
  5a559d1c Browse Files