Commits · 470493eedf788a6b0223221a2cc2c10d9efe2b90 · order-group-application / order-group

29 Oct, 2020 28 commits
- Merge remote-tracking branch 'origin/qa' into qa · 470493ee
  徐康 committed Oct 29, 2020
  
  470493ee Browse Files
- 升级sdk · fff2fad6
  徐康 committed Oct 29, 2020
  
  fff2fad6 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 5a088841
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  5a088841 Browse Files
- 套餐子商品spuid取值修改 · 97e7ff03
  ping.wu committed Oct 29, 2020
  
  97e7ff03 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 9a3a368d
  徐康 committed Oct 29, 2020
  
  9a3a368d Browse Files
- 加料商品顺序 · ea0a418d
  徐康 committed Oct 29, 2020
  
  ea0a418d Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · ef338f82
  徐康 committed Oct 29, 2020
  
  ef338f82 Browse Files
- 加料价格 · c3ab1e95
  徐康 committed Oct 29, 2020
  
  c3ab1e95 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 49aa6e82
  徐康 committed Oct 29, 2020
  
  49aa6e82 Browse Files
- test · 3537af1d
  徐康 committed Oct 29, 2020
  
  3537af1d Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 48a17c29
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 29, 2020
  48a17c29 Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · bc7b879d
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  ping.wu committed Oct 29, 2020
  bc7b879d Browse Files
- 套餐子商品spuid取值修改 · eca713f8
  ping.wu committed Oct 29, 2020
  
  eca713f8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 8360d19b
  chongfu.liang committed Oct 29, 2020
  
  8360d19b Browse Files
- Merge branch 'feature/2.0.4-修改支持的订单类型' into qa · 6d423c9c
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
#	shopping-cart-application-service/src/test/java/cn.freemud/service/CouponTest.java
```
  chongfu.liang committed Oct 29, 2020
  6d423c9c Browse Files
- 创建配送单支持类型改造 · c4c548c9
  chongfu.liang committed Oct 29, 2020
  
  c4c548c9 Browse Files
- Merge branch 'feature/20201015_麦咖啡允许重复申请退款_xukang' into qa · b952bcad
  徐康 committed Oct 29, 2020
  
  b952bcad Browse Files
- 拒单时间 · 01f8649b
  徐康 committed Oct 29, 2020
  
  01f8649b Browse Files
- Merge branch '2020/10/06-随单购买月享卡-huiyang' into qa · abc0eaf2
```
# 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
```
  徐康 committed Oct 29, 2020
  abc0eaf2 Browse Files
- 餐道价格显示 · 43cc310f
  徐康 committed Oct 29, 2020
  
  43cc310f Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · d5d5c5d2
  徐康 committed Oct 29, 2020
  
  d5d5c5d2 Browse Files
- 餐道价格显示 · c4719198
  徐康 committed Oct 29, 2020
  
  c4719198 Browse Files
- Merge branch 'feature/20201022_入机键位修改_xukang' into qa · 4bcc5a89
  徐康 committed Oct 29, 2020
  
  4bcc5a89 Browse Files
- 再来一单 · 0b7a5b69
  徐康 committed Oct 29, 2020
  
  0b7a5b69 Browse Files
- 麦咖啡随单购卡优惠 1 · c3d2bb92
  huiyang.chen committed Oct 29, 2020
  
  c3d2bb92 Browse Files
- Merge branch 'feature-yu.sun-material-20201030' into qa · 6c2307bf
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Oct 29, 2020
  6c2307bf Browse Files
- Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into… · 1a89f938
```
Merge remote-tracking branch 'origin/feature-yu.sun-material-20201030' into feature-yu.sun-material-20201030
```
  徐康 committed Oct 29, 2020
  1a89f938 Browse Files
- 加料再来一单 · 6ca9d366
  徐康 committed Oct 29, 2020
  
  6ca9d366 Browse Files
28 Oct, 2020 12 commits
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 2df672ae
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 28, 2020
  2df672ae Browse Files
- 套餐子商品价格取FinalPrice · d4e0f803
  ping.wu committed Oct 28, 2020
  
  d4e0f803 Browse Files
- 麦咖啡随单购卡优惠 1 · e0e6cb33
  huiyang.chen committed Oct 28, 2020
  
  e0e6cb33 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into qa · 8c017d41
  徐康 committed Oct 28, 2020
  
  8c017d41 Browse Files
- 啡常月享卡 · 125b619c
  徐康 committed Oct 28, 2020
  
  125b619c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 39a67ea7
  徐康 committed Oct 28, 2020
  
  39a67ea7 Browse Files
- 啡常月享卡 · 744caf53
  徐康 committed Oct 28, 2020
  
  744caf53 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 0cdbdc0a
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 28, 2020
  0cdbdc0a Browse Files
- 报错修改 · c3f670e6
  ping.wu committed Oct 28, 2020
  
  c3f670e6 Browse Files
- Merge branch 'feature/20201021_万能券展示问题_xukang' into qa · f9bc63f4
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  徐康 committed Oct 28, 2020
  f9bc63f4 Browse Files
- 啡常月享卡 · 4d439421
  徐康 committed Oct 28, 2020
  
  4d439421 Browse Files
- Merge branches 'feature-yu.sun-material-20201030' and 'qa' of… · 23155cfc
```
Merge branches 'feature-yu.sun-material-20201030' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 28, 2020
  23155cfc Browse Files