Commits · 2e6a711e194ee751241bb8caefe262dae1e01850 · order-group-application / order-group

10 Oct, 2020 1 commit

Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 2e6a711e

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java

committed Oct 10, 2020

2e6a711e Browse Files

09 Oct, 2020 12 commits
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' into develop · 19fc41bb
  zhiheng.zhang committed Oct 09, 2020
  
  19fc41bb Browse Files
- C端停车场订单只查询支付成功的订单 · 864d5bcc
  zhiheng.zhang committed Oct 09, 2020
  
  864d5bcc Browse Files
- 运费券记录到缓存 · 63fdf2d3
  徐康 committed Oct 09, 2020
  
  63fdf2d3 Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · fc2ae16c
  huiyang.chen committed Oct 09, 2020
  
  fc2ae16c Browse Files
- fix 相同商品券校验除去 · 2859b741
  huiyang.chen committed Oct 09, 2020
  
  2859b741 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 7a2aa3b8
  zhiheng.zhang committed Oct 09, 2020
  
  7a2aa3b8 Browse Files
- Merge branch 'feature/2020/09/17-1.20-订单投传panChannelType-张志恒' into develop · f5b59cd4
  zhiheng.zhang committed Oct 09, 2020
  
  f5b59cd4 Browse Files
- C端停车场订单只查询支付成功的订单 · 3ebe1d7c
  zhiheng.zhang committed Oct 09, 2020
  
  3ebe1d7c Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · 5a70722f
  huiyang.chen committed Oct 09, 2020
  
  5a70722f Browse Files
- fix 优惠券折扣取值变更 · ae6b11c0
  huiyang.chen committed Oct 09, 2020
  
  ae6b11c0 Browse Files
- Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 80c13916
  徐康 committed Oct 09, 2020
  
  80c13916 Browse Files
- 使用skuname · 6d7055fa
  徐康 committed Oct 09, 2020
  
  6d7055fa Browse Files
08 Oct, 2020 4 commits
- Merge branch '2020/09/24-运费券-huiyang' into develop · ae724e05
  huiyang.chen committed Oct 08, 2020
  
  ae724e05 Browse Files
- fix 注释 · 0faa424a
  huiyang.chen committed Oct 08, 2020
  
  0faa424a Browse Files
- Merge branch '2020/09/24-运费券-huiyang' into develop · 6f0acf13
  huiyang.chen committed Oct 08, 2020
  
  6f0acf13 Browse Files
- fix 返回商品券名称 · 2a7360e0
  huiyang.chen committed Oct 08, 2020
  
  2a7360e0 Browse Files
07 Oct, 2020 3 commits
- Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of… · 0743dae6
```
Merge branches 'develop' and 'feature/20200926_麦咖啡特定属性与加料_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Oct 07, 2020
  0743dae6 Browse Files
- 套餐可选商品必选时候，传空键位失败 · 376d2d10
  ping.wu committed Oct 07, 2020
  
  376d2d10 Browse Files
- 套餐可选商品空键位 · 36338125
  ping.wu committed Oct 07, 2020
  
  36338125 Browse Files
05 Oct, 2020 1 commit
- 套餐价格取固定商品价格，总价格加可选商品价格 · 8a745e29
  ping.wu committed Oct 05, 2020
  
  8a745e29 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 2 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