Commits · cf73af221dc80f849176eaac414a400995d11b00 · order-group-application / order-group

05 Oct, 2020 2 commits

Merge branches 'develop' and 'feature/20200929_麦咖啡再来一单' of… · cf73af22

Merge branches 'develop' and 'feature/20200929_麦咖啡再来一单' 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

committed Oct 05, 2020

cf73af22 Browse Files

再来一单校验修改 · e8d46e16
ping.wu committed Oct 05, 2020

e8d46e16 Browse Files

30 Sep, 2020 17 commits
- 停车场订单正向逻辑 · 5473b22f
  zhiheng.zhang committed Sep 30, 2020
  
  5473b22f Browse Files
- Merge branch 'feature/2020/09/30-20-停车上订单未支付积分回退-张志恒' into develop · 8502b1ba
```
# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  zhiheng.zhang committed Sep 30, 2020
  8502b1ba Browse Files
- 停车场订单正向逻辑 · a470a7fe
  zhiheng.zhang committed Sep 30, 2020
  
  a470a7fe Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into develop · c79859b9
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  c79859b9 Browse Files
- 换购券Alpha · 7b2548fd
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  7b2548fd Browse Files
- Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of… · bef95551
```
Merge branches 'develop' and 'feature/20200915_购物车添加限制数量_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Sep 30, 2020
  bef95551 Browse Files
- 购物车数量限制修改 · 39153b59
  ping.wu committed Sep 30, 2020
  
  39153b59 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · 540c0cec
  huiyang.chen committed Sep 30, 2020
  
  540c0cec Browse Files
- fix 月卡加减购物车 · b16452e2
  huiyang.chen committed Sep 30, 2020
  
  b16452e2 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into develop · 0d0a3b32
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  0d0a3b32 Browse Files
- 换购券Alpha · e7dd375a
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  e7dd375a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into develop · 5a61e647
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  5a61e647 Browse Files
- 对接促销算价Alpha->fix · 2d5b2166
  xiaoer.li@freemud.com committed Sep 30, 2020
  
  2d5b2166 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · 10e5a7c9
  huiyang.chen committed Sep 30, 2020
  
  10e5a7c9 Browse Files
- fix coupon1 · a0e1e8ef
  huiyang.chen committed Sep 30, 2020
  
  a0e1e8ef Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · d5e6a3b7
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  huiyang.chen committed Sep 30, 2020
  d5e6a3b7 Browse Files
- fix coupon · f041c346
  huiyang.chen committed Sep 30, 2020
  
  f041c346 Browse Files
29 Sep, 2020 21 commits
- Merge branch '2020/09/24-运费券-huiyang' into develop · 1d7d958a
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  huiyang.chen committed Sep 29, 2020
  1d7d958a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · db0bd421
  徐康 committed Sep 29, 2020
  
  db0bd421 Browse Files
- fix · 52cb08f5
  huiyang.chen committed Sep 29, 2020
  
  52cb08f5 Browse Files
- 对接运费券 · 68cab4e4
  徐康 committed Sep 29, 2020
  
  68cab4e4 Browse Files
- 报错修改 · 49bcd4c3
  ping.wu committed Sep 29, 2020
  
  49bcd4c3 Browse Files
- Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of… · 4818cd7b
```
Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Sep 29, 2020
  4818cd7b Browse Files
- 多规格定制属性赋值 · c883877c
  ping.wu committed Sep 29, 2020
  
  c883877c Browse Files
- 再来一单信息校验和更新 · 3cea7744
  徐康 committed Sep 29, 2020
  
  3cea7744 Browse Files
- 再来一单门店校验 · d8a79ac6
  徐康 committed Sep 29, 2020
  
  d8a79ac6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2.0-换购券' into develop · 647d7c0f
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
```
  xiaoer.li@freemud.com committed Sep 29, 2020
  647d7c0f Browse Files
- 换购券Alpha · 1159d120
  xiaoer.li@freemud.com committed Sep 29, 2020
  
  1159d120 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · b3df6703
  徐康 committed Sep 29, 2020
  
  b3df6703 Browse Files
- 入机使用specialCode · 602f31a6
  徐康 committed Sep 29, 2020
  
  602f31a6 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 6046cc06
  zhiheng.zhang committed Sep 29, 2020
  
  6046cc06 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into develop · e2d93ea0
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  zhiheng.zhang committed Sep 29, 2020
  e2d93ea0 Browse Files
- payChannelType获取路径修改 · 30f80495
  zhiheng.zhang committed Sep 29, 2020
  
  30f80495 Browse Files
- session · 06b53272
  huiyang.chen committed Sep 29, 2020
  
  06b53272 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 629732ff
  徐康 committed Sep 29, 2020
  
  629732ff Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · eece253b
  徐康 committed Sep 29, 2020
  
  eece253b Browse Files
- 订单问题修复 · 17fe0e24
  徐康 committed Sep 29, 2020
  
  17fe0e24 Browse Files
- 接受specialList · 4ff38d93
  徐康 committed Sep 29, 2020
  
  4ff38d93 Browse Files