Commits · 477378735edbcd35afe2aebe9fb9e5b9c71f19c1 · order-group-application / order-group

08 Sep, 2020 13 commits
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 47737873
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 08, 2020
  47737873 Browse Files
- 再来一单门店号问题 · beb23e37
  ping.wu committed Sep 08, 2020
  
  beb23e37 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 6a5a878d
  徐康 committed Sep 08, 2020
  
  6a5a878d Browse Files
- 麦咖啡支持优惠类型：代金券，满减优惠，商品券，超值加购，限时折扣 · 9613be49
  徐康 committed Sep 08, 2020
  
  9613be49 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 254dc11b
  徐康 committed Sep 08, 2020
  
  254dc11b Browse Files
- 运单异常允许退款，未汇集 · 1a7ea1ed
  徐康 committed Sep 08, 2020
  
  1a7ea1ed Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 1bba9416
```
# Conflicts:
#	order-application-service/pom.xml
```
  徐康 committed Sep 08, 2020
  1bba9416 Browse Files
- 商品价格为0 · 696df096
  徐康 committed Sep 08, 2020
  
  696df096 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · f831319f
  徐康 committed Sep 08, 2020
  
  f831319f Browse Files
- 麦咖啡超时时间只取超时关单配置，不取超时接单配置 · c9e0a308
  徐康 committed Sep 08, 2020
  
  c9e0a308 Browse Files
- 取消券码核销逻辑修改 · ad27dfb4
  vega committed Sep 08, 2020
  
  ad27dfb4 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 37c279ba
  徐康 committed Sep 08, 2020
  
  37c279ba Browse Files
- 麦咖啡超时时间设置为0 · 13fc4ab4
  徐康 committed Sep 08, 2020
  
  13fc4ab4 Browse Files
07 Sep, 2020 10 commits
- extInfo获取 · d6caf34e
  徐康 committed Sep 07, 2020
  
  d6caf34e Browse Files
- 麦咖啡订单详情返回收货地址id · 3ac32ba0
  徐康 committed Sep 07, 2020
  
  3ac32ba0 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 627ca0ad
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
```
  徐康 committed Sep 07, 2020
  627ca0ad Browse Files
- 麦咖啡订单详情返回收货地址id · cd06a09a
  徐康 committed Sep 07, 2020
  
  cd06a09a Browse Files
- 通过基础订单服务保存收货地址Id · 4a42566e
  徐康 committed Sep 07, 2020
  
  4a42566e Browse Files
- 调用基础订单服务保存收货地址Id · 0522cff9
  徐康 committed Sep 07, 2020
  
  0522cff9 Browse Files
- 调用基础订单服务保存收货地址Id · 902d873c
  徐康 committed Sep 07, 2020
  
  902d873c Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 5c65a247
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 07, 2020
  5c65a247 Browse Files
- 代码注释 · 00010ffb
  ping.wu committed Sep 07, 2020
  
  00010ffb Browse Files
- fix 自提核销券 · f9380c01
  huiyang.chen committed Sep 07, 2020
  
  f9380c01 Browse Files
06 Sep, 2020 16 commits
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · d29fe427
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 06, 2020
  d29fe427 Browse Files
- 套餐价为子商品最终价总和 · 9f7f8e32
  ping.wu committed Sep 06, 2020
  
  9f7f8e32 Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 9859e447
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 06, 2020
  9859e447 Browse Files
- 套餐价为子商品最终价总和 · aa77410e
  ping.wu committed Sep 06, 2020
  
  aa77410e Browse Files
- fix 核销券bug · f01a7d59
  huiyang.chen committed Sep 06, 2020
  
  f01a7d59 Browse Files
- fix 核销券log · 4a968e4f
  huiyang.chen committed Sep 06, 2020
  
  4a968e4f Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 074252b6
  徐康 committed Sep 06, 2020
  
  074252b6 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · f3dc8c67
  徐康 committed Sep 06, 2020
  
  f3dc8c67 Browse Files
- 新增的feign client打印日志 · 4e683d5b
  徐康 committed Sep 06, 2020
  
  4e683d5b Browse Files
- fix log · fdff0c3f
  huiyang.chen committed Sep 06, 2020
  
  fdff0c3f Browse Files
- 去除退款校验，餐道回调退款一律支持 · 3c2b7415
  徐康 committed Sep 06, 2020
  
  3c2b7415 Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 14e17ca4
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 06, 2020
  14e17ca4 Browse Files
- 商品券真实价格显示 · 7921647b
  ping.wu committed Sep 06, 2020
  
  7921647b Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · ec985ce2
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 06, 2020
  ec985ce2 Browse Files
- 商品券活动名称错误修改 · 79ee9bd8
  ping.wu committed Sep 06, 2020
  
  79ee9bd8 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 312f284d
  huiyang.chen committed Sep 06, 2020
  
  312f284d Browse Files
05 Sep, 2020 1 commit

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · 2d8834cf

Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

committed Sep 05, 2020

2d8834cf Browse Files