Commits · 1a4ce0f9daec6fe51648242d307a3709a58dacc0 · order-group-application / order-group · GitLab

06 May, 2020 10 commits
- Merge branch 'feature/2020323_1.9.17_rocketmq' into qa · 1a4ce0f9
  胡超 committed May 06, 2020
  
  1a4ce0f9 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 5da892b2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/readme.md
```
  胡超 committed May 06, 2020
  5da892b2 Browse Files
- 删除多余代码 · 7cec384c
  胡超 committed May 06, 2020
  
  7cec384c Browse Files
- RocketMQ topic 、producerGroup、consumerGroup 最大长度32，格式为 ^[%|a-zA-Z0-9_-] · 73cf2012
  胡超 committed May 06, 2020
  
  73cf2012 Browse Files
- 升级sdk版本 · d432f8f5
  shuhu.hou@freemud.cn committed May 06, 2020
  
  d432f8f5 Browse Files
- 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
- RocketMQConst · 9362076c
  胡超 committed May 06, 2020
  
  9362076c 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
30 Apr, 2020 3 commits
- 配送通知rocketmq · 15f0470f
  胡超 committed Apr 30, 2020
  
  15f0470f Browse Files
- Merge remote-tracking branch 'remotes/origin/master' into feature/2020323_1.9.17_rocketmq · a9268329
  胡超 committed Apr 30, 2020
  
  a9268329 Browse Files
- 配送通知rocketmq · 9a334b5f
  胡超 committed Apr 30, 2020
  
  9a334b5f Browse Files
29 Apr, 2020 11 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 remote-tracking branch 'remotes/origin/feature_20200426_1.9.21_refundDeliveryFee' into qa · dccecf33
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  胡超 committed Apr 29, 2020
  dccecf33 Browse Files
- 升级sdk-费用记录添加字段实际金额 · 69eafd80
  胡超 committed Apr 29, 2020
  
  69eafd80 Browse Files
- Merge branch 'feature/1.9.21-配送费20200424-dingkai' into qa · 3856a9dd
  dingkai committed Apr 29, 2020
  
  3856a9dd Browse Files
28 Apr, 2020 5 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
- Merge remote-tracking branch 'remotes/origin/master' into feature/2020323_1.9.17_rocketmq · fbc288ca
  胡超 committed Apr 28, 2020
  
  fbc288ca Browse Files
- sendRocketMqOfDeliveryInfo · 7159ffb8
  胡超 committed Apr 28, 2020
  
  7159ffb8 Browse Files
27 Apr, 2020 11 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_取餐码' · 206c3f1d
  xiaoer.li@freemud.com committed Apr 27, 2020
  
  206c3f1d Browse Files
- 门店配送 · 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
- Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of… · cf2b3660
```
Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Apr 27, 2020
  cf2b3660 Browse Files
- 自配送配送状态修改 · 4cfb8fa2
  ping.wu committed Apr 27, 2020
  
  4cfb8fa2 Browse Files
- 自配送配送状态修改 · 0fd512ca
  ping.wu committed Apr 27, 2020
  
  0fd512ca Browse Files
- Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of… · af5202fb
```
Merge branches 'feature/20200424_订单详情订单状态错误修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Apr 27, 2020
  af5202fb Browse Files
- 升级sdk · f5feb266
  xiaoer.li@freemud.com committed Apr 27, 2020
  
  f5feb266 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_异常单查询' · 8becf982
  xiaoer.li@freemud.com committed Apr 27, 2020
  
  8becf982 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