Commits · b352512cf5747df25ec1d16c0225aa064fed55ae · order-group-application / order-group

28 Oct, 2020 5 commits
- 报错修改 · b352512c
  ping.wu committed Oct 28, 2020
  
  b352512c Browse Files
- Merge branches 'develop' and 'feature-yu.sun-material-20201030' of… · 92d35a50
```
Merge branches 'develop' and 'feature-yu.sun-material-20201030' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  ping.wu committed Oct 28, 2020
  92d35a50 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 3ae88433
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 28, 2020
  3ae88433 Browse Files
- 麦咖啡加料价格 · 8094ee88
  ping.wu committed Oct 28, 2020
  
  8094ee88 Browse Files
- 加料再来一单 · 88cab690
  徐康 committed Oct 28, 2020
  
  88cab690 Browse Files
27 Oct, 2020 1 commit
- 麦咖啡多规格加料 · 068385c7
  ping.wu committed Oct 27, 2020
  
  068385c7 Browse Files
26 Oct, 2020 1 commit
- 麦咖啡多规格加料 · cc9be1ca
  ping.wu committed Oct 26, 2020
  
  cc9be1ca Browse Files
23 Oct, 2020 4 commits
- 加料键位字段修改 · 9073d88e
  ping.wu committed Oct 23, 2020
  
  9073d88e Browse Files
- 加料键位字段修改 · 4706aaa7
  ping.wu committed Oct 23, 2020
  
  4706aaa7 Browse Files
- 加料键位字段修改 · 6493ee45
  ping.wu committed Oct 23, 2020
  
  6493ee45 Browse Files
- 修改加料商品赋值 · 1623aafc
  ping.wu committed Oct 23, 2020
  
  1623aafc Browse Files
22 Oct, 2020 2 commits
- 加料商品键位修改 · 5b116545
  ping.wu committed Oct 22, 2020
  
  5b116545 Browse Files
- 加料商品键位修改 · 6339f1a9
  ping.wu committed Oct 22, 2020
  
  6339f1a9 Browse Files
21 Oct, 2020 2 commits
- sunyu::update::new function about MCoffee Material · ba35b5eb
  yu.sun committed Oct 22, 2020
  
  ba35b5eb Browse Files
- sunyu::update::new function about MCoffee Material · 0e85cf89
  yu.sun committed Oct 22, 2020
  
  0e85cf89 Browse Files
20 Oct, 2020 25 commits
- sunyu::new function about material · 45f73735
  yu.sun committed Oct 21, 2020
  
  45f73735 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
- sunyu::update::new function about material · 83276fd5
  yu.sun committed Oct 20, 2020
  
  83276fd5 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
- 校验保存的券是否可用 · 497bb1b5
  徐康 committed Oct 20, 2020
  
  497bb1b5 Browse Files
- 校验保存的券是否可用 · 232e31e2
  徐康 committed Oct 20, 2020
  
  232e31e2 Browse Files
- 校验保存的券是否可用 · f6e7e5fb
  徐康 committed Oct 20, 2020
  
  f6e7e5fb Browse Files
- 校验保存的券是否可用 · 0f46f80e
  徐康 committed Oct 20, 2020
  
  0f46f80e Browse Files
- sunyu::update::merge branch to master from new function about getCartInfoByUser · 283076d3
  yu.sun committed Oct 20, 2020
  
  283076d3 Browse Files
- 校验保存的券是否可用 · 1d04f228
  徐康 committed Oct 20, 2020
  
  1d04f228 Browse Files
- 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