Commits · 7c3a6fb9b136491d76e36ec335af66455a8a0726 · order-group-application / order-group · GitLab

06 May, 2020 4 commits
- Merge branch 'feature/20200423_订单oms逆向流程' into qa · 7c3a6fb9
  shuhu.hou@freemud.cn committed May 06, 2020
  
  7c3a6fb9 Browse Files
- 购物车代码恢复 · f2324e84
  shuhu.hou@freemud.cn committed May 06, 2020
  
  f2324e84 Browse Files
- 购物车代码恢复 · 8cd921b9
  shuhu.hou@freemud.cn committed May 06, 2020
  
  8cd921b9 Browse Files
- Merge branch 'master' into feature/20200423_订单oms逆向流程 · 2f1e20e2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
#	order-management/src/main/java/cn/freemud/management/service/impl/OrderDeliveryService.java
#	order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java
```
  shuhu.hou@freemud.cn committed May 06, 2020
  2f1e20e2 Browse Files
29 Apr, 2020 9 commits
- Merge remote-tracking branch 'origin/qa' into qa · 46eb23a0
  xiaoer.li@freemud.com committed Apr 29, 2020
  
  46eb23a0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into qa · 639a92e3
  xiaoer.li@freemud.com committed Apr 29, 2020
  
  639a92e3 Browse Files
- 调整exchange · a841bc91
  xiaoer.li@freemud.com committed Apr 29, 2020
  
  a841bc91 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' into qa · db5ec86f
  xiaoer.li@freemud.com committed Apr 29, 2020
  
  db5ec86f Browse Files
- 调整exchange · ac054672
  xiaoer.li@freemud.com committed Apr 29, 2020
  
  ac054672 Browse Files
- Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of… · 28267cd3
```
Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Apr 29, 2020
  28267cd3 Browse Files
- 聚合sdk1.5.7-SNAPSHOT · 6ec33927
  ping.wu committed Apr 29, 2020
  
  6ec33927 Browse Files
- Merge branches 'feature/20200421_申请退款任务_wuping' and 'qa' of… · e2090f17
```
Merge branches 'feature/20200421_申请退款任务_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# 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 29, 2020
  e2090f17 Browse Files
- Merge branch 'feature/1.9.21-配送费20200424-dingkai' into qa · 3856a9dd
  dingkai committed Apr 29, 2020
  
  3856a9dd Browse Files
28 Apr, 2020 3 commits
- 申请退款对接订单取消接口 · 71bb5786
  ping.wu committed Apr 28, 2020
  
  71bb5786 Browse Files
- automaticRefund String类型改int类型 · 942a8e41
  ping.wu committed Apr 28, 2020
  
  942a8e41 Browse Files
- 返回48小时未处理退款描述 · 8bcbba72
  ping.wu committed Apr 28, 2020
  
  8bcbba72 Browse Files
27 Apr, 2020 21 commits
- 门店配送 · 2c229eba
  dingkai committed Apr 27, 2020
  
  2c229eba Browse Files
- Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'qa' of… · d0bc5a95
```
Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Apr 27, 2020
  d0bc5a95 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 qa · c75d977c
  xiaoer.li@freemud.com committed Apr 27, 2020
  
  c75d977c Browse Files
- 增加创建售后单任务 · 0b23441c
  ping.wu committed Apr 27, 2020
  
  0b23441c Browse Files
- 详情返回售后单创建时间 · e4af590c
  ping.wu committed Apr 27, 2020
  
  e4af590c Browse Files
- app下单修改 · 725f6773
  ping.wu committed Apr 27, 2020
  
  725f6773 Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' into qa · 3cf189d4
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
```
  dingkai committed Apr 27, 2020
  3cf189d4 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
- 升级聚合订单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
- oms逆向单整理，代码优化 · 56b75b51
  shuhu.hou@freemud.cn committed Apr 27, 2020
  
  56b75b51 Browse Files
26 Apr, 2020 3 commits
- app下单修改 · 08d0017f
  ping.wu committed Apr 26, 2020
  
  08d0017f Browse Files
- 门店配送 · 58e7a763
  dingkai committed Apr 26, 2020
  
  58e7a763 Browse Files
- fix:外卖取餐码 · a4c35ed9
  xiaoer.li@freemud.com committed Apr 26, 2020
  
  a4c35ed9 Browse Files