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

28 Apr, 2020 6 commits
- Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of… · bcb68580
```
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  ping.wu committed Apr 28, 2020
  bcb68580 Browse Files
- 申请退款对接订单取消接口 · 71bb5786
  ping.wu committed Apr 28, 2020
  
  71bb5786 Browse Files
- Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of… · 3b342671
```
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Apr 28, 2020
  3b342671 Browse Files
- automaticRefund String类型改int类型 · 942a8e41
  ping.wu committed Apr 28, 2020
  
  942a8e41 Browse Files
- Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of… · bba6374f
```
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Apr 28, 2020
  bba6374f Browse Files
- 返回48小时未处理退款描述 · 8bcbba72
  ping.wu committed Apr 28, 2020
  
  8bcbba72 Browse Files
27 Apr, 2020 22 commits
- Merge branches 'develop' and 'feature/20200424_订单详情订单状态错误修改_wuping' of… · 61653523
```
Merge branches 'develop' and 'feature/20200424_订单详情订单状态错误修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Apr 27, 2020
  61653523 Browse Files
- 自配送配送状态修改 · 4cfb8fa2
  ping.wu committed Apr 27, 2020
  
  4cfb8fa2 Browse Files
- 自配送配送状态修改 · 0fd512ca
  ping.wu committed Apr 27, 2020
  
  0fd512ca Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_取餐码' into develop · 47691d1c
  xiaoer.li@freemud.com committed Apr 27, 2020
  
  47691d1c Browse Files
- Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of… · ea63a48e
```
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	ordercenter-sdk/readme.md
```
  ping.wu committed Apr 27, 2020
  ea63a48e Browse Files
- 增加创建售后单任务 · 0b23441c
  ping.wu committed Apr 27, 2020
  
  0b23441c Browse Files
- 聚合订单升级1.5.6-SNAPSHOT · d53edd0f
  ping.wu committed Apr 27, 2020
  
  d53edd0f Browse Files
- Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of… · 45ab64a5
```
Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  ping.wu committed Apr 27, 2020
  45ab64a5 Browse Files
- 详情返回售后单创建时间 · e4af590c
  ping.wu committed Apr 27, 2020
  
  e4af590c Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' into develop · d5e71139
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  dingkai committed Apr 27, 2020
  d5e71139 Browse Files
- 支付sdk paycode · 03febf60
  dingkai committed Apr 27, 2020
  
  03febf60 Browse Files
- Merge branch 'feature/1.9.20-蜜雪中台-dingkai' · 33a2c878
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  dingkai committed Apr 27, 2020
  33a2c878 Browse Files
- dev环境添加控制台输出 · d2bb7c66
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  d2bb7c66 Browse Files
- 升级聚合订单sdk版本 · 986eb351
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  986eb351 Browse Files
- Merge remote-tracking branch 'origin/master' · 093618cb
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed Apr 27, 2020
  093618cb Browse Files
- 配送费更新版本 · 38faa509
  姜海波 committed Apr 27, 2020
  
  38faa509 Browse Files
- 配送费更新版本 · 4cf222b1
  姜海波 committed Apr 27, 2020
  
  4cf222b1 Browse Files
- 配送费更新版本 · 464e94bd
  姜海波 committed Apr 27, 2020
  
  464e94bd Browse Files
- 配送费更新版本 · d85ffe00
  姜海波 committed Apr 27, 2020
  
  d85ffe00 Browse Files
- 升级聚合订单sdk版本 · d7b51f09
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  d7b51f09 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/4/16-1.9.20-满减配送费记录修改-海波' · e0969ea0
  姜海波 committed Apr 27, 2020
  
  e0969ea0 Browse Files
- Merge branch 'feature/20200420_oms接单二期' · 3736507e
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  3736507e Browse Files
26 Apr, 2020 1 commit
- fix:外卖取餐码 · a4c35ed9
  xiaoer.li@freemud.com committed Apr 26, 2020
  
  a4c35ed9 Browse Files
24 Apr, 2020 11 commits
- Merge branch 'feature/20200420_oms接单二期' into develop · 8ec97d44
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  8ec97d44 Browse Files
- 非支付宝、微信渠道不创建配送单 · c7db13ba
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  c7db13ba Browse Files
- 升级聚合sdk版本 · 32230ac2
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  32230ac2 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 48af832e
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  48af832e Browse Files
- 订单渠道类型新增支付宝渠道 · 6eeb4602
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  6eeb4602 Browse Files
- Merge branches 'develop' and 'feature/20200424_订单详情订单状态错误修改_wuping' of… · 4090e8b7
```
Merge branches 'develop' and 'feature/20200424_订单详情订单状态错误修改_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Apr 24, 2020
  4090e8b7 Browse Files
- 制作完成匹配订单状态错误修改 · 49a58785
  ping.wu committed Apr 24, 2020
  
  49a58785 Browse Files
- Merge branch 'feature/20200420_oms接单二期' into develop · aef1b803
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  aef1b803 Browse Files
- oms订单履单正向流程修复履单流程 · 28dd3104
  shuhu.hou@freemud.cn committed Apr 24, 2020
  
  28dd3104 Browse Files
- 优化ES 查询sdk · 0d19821e
  姜海波 committed Apr 24, 2020
  
  0d19821e Browse Files
- Merge branch 'develop' of… · 6513658e
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  姜海波 committed Apr 24, 2020
  6513658e Browse Files