Commits · ae5eb696710b54576a2ee309ea61cabe5857be31 · order-group-application / order-group · GitLab

29 Sep, 2020 9 commits
- Merge remote-tracking branch 'origin/qa' into qa · ae5eb696
  zhiheng.zhang committed Sep 29, 2020
  
  ae5eb696 Browse Files
- Merge branch 'feature/2020/09/11-1.9.39-混合支付-张志恒' into qa · 975cb72b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	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
```
  zhiheng.zhang committed Sep 29, 2020
  975cb72b Browse Files
- payChannelType获取路径修改 · 30f80495
  zhiheng.zhang committed Sep 29, 2020
  
  30f80495 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 8a52530d
  xiaoer.li committed Sep 29, 2020
  
  8a52530d Browse Files
- 对接促销算价Alpha->fix · afb76ae0
  xiaoer.li committed Sep 29, 2020
  
  afb76ae0 Browse Files
- Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of… · ff520320
```
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 29, 2020
  ff520320 Browse Files
- 套餐多规格赋值修改 · 7135b453
  ping.wu committed Sep 29, 2020
  
  7135b453 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 105202ec
  xiaoer.li committed Sep 29, 2020
  
  105202ec Browse Files
- 对接促销算价Alpha->fix · ba8f87ef
  xiaoer.li committed Sep 29, 2020
  
  ba8f87ef Browse Files
28 Sep, 2020 25 commits
- 对接促销算价Alpha->fix · 91003e3b
  xiaoer.li committed Sep 28, 2020
  
  91003e3b Browse Files
- 对接促销算价Alpha->fix · 036c9d4f
  xiaoer.li committed Sep 28, 2020
  
  036c9d4f Browse Files
- 对接促销算价Alpha->fix · 871c8449
  xiaoer.li committed Sep 28, 2020
  
  871c8449 Browse Files
- 报错修改 · 61a5e920
  ping.wu committed Sep 28, 2020
  
  61a5e920 Browse Files
- Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of… · 702e48c2
```
Merge branches 'feature/20200915_购物车添加限制数量_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  ping.wu committed Sep 28, 2020
  702e48c2 Browse Files
- Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of… · 95a54b43
```
Merge branches 'feature/20200926_麦咖啡特定属性与加料_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  ping.wu committed Sep 28, 2020
  95a54b43 Browse Files
- 对接促销算价Alpha->fix · 6c39488c
  xiaoer.li committed Sep 28, 2020
  
  6c39488c Browse Files
- 更新购物车数量 · 1a7da411
  ping.wu committed Sep 28, 2020
  
  1a7da411 Browse Files
- 加料id赋值错误修改 · 89f3fb94
  ping.wu committed Sep 28, 2020
  
  89f3fb94 Browse Files
- 麦咖啡加料与特制属性 · bdd1792b
  ping.wu committed Sep 28, 2020
  
  bdd1792b Browse Files
- 修复套餐价格不对 · 3d623e5c
  徐康 committed Sep 28, 2020
  
  3d623e5c Browse Files
- Merge branch 'bugfix/20200924_修复问题临时分支' into qa · 83171ea6
  徐康 committed Sep 28, 2020
  
  83171ea6 Browse Files
- 修复套餐价格不对 · b6bea35d
  徐康 committed Sep 28, 2020
  
  b6bea35d Browse Files
- mccafe套餐价格重新计算 · 734bec0f
  徐康 committed Sep 28, 2020
  
  734bec0f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 695de7c7
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  695de7c7 Browse Files
- 对接促销算价Alpha->fix · 62d6eaca
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  62d6eaca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 75b8c7b9
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  75b8c7b9 Browse Files
- 对接促销算价Alpha->fix · a75c6358
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  a75c6358 Browse Files
- 对接促销算价Alpha->fix · 714ed0c0
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  714ed0c0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 13fd24f5
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  13fd24f5 Browse Files
- 对接促销算价Alpha->fix · eaa5c377
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  eaa5c377 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · f7e261d8
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  f7e261d8 Browse Files
- 对接促销算价Alpha->fix · d34c33b6
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  d34c33b6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 3a50e9c6
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  3a50e9c6 Browse Files
- 对接促销算价Alpha->fix · cf2def0a
  xiaoer.li@freemud.com committed Sep 28, 2020
  
  cf2def0a Browse Files
27 Sep, 2020 6 commits
- Merge remote-tracking branch 'origin/qa' into qa · c17b6646
  zhiheng.zhang committed Sep 27, 2020
  
  c17b6646 Browse Files
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' into qa · 9f4801dd
  zhiheng.zhang committed Sep 27, 2020
  
  9f4801dd Browse Files
- sqa测试查询两个月的数据，生产不做修改 · 7e03122e
  zhiheng.zhang committed Sep 27, 2020
  
  7e03122e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/促销算价基于最新master的分支' into qa · 6688356f
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  6688356f Browse Files
- 对接促销算价Alpha->fix · 51e3855c
  xiaoer.li@freemud.com committed Sep 27, 2020
  
  51e3855c Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 22bab378
  zhiheng.zhang committed Sep 27, 2020
  
  22bab378 Browse Files