Commits · 71f9dd5d40dc148e3e3d2893f2a1a72aea0262f4 · order-group-application / order-group

18 May, 2020 6 commits

Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' · 71f9dd5d

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

committed May 18, 2020

71f9dd5d Browse Files

Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' · 1c8e9dd1

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

committed May 18, 2020

1c8e9dd1 Browse Files

Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' · a88619e2

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

committed May 18, 2020

a88619e2 Browse Files

增加日志 · dba83524
haibo.jiang committed May 18, 2020

dba83524 Browse Files
退单增加配送费逻辑 · 0bd2275d
haibo.jiang committed May 18, 2020

0bd2275d Browse Files
Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' · fd61cca6
xiaoer.li committed May 18, 2020

fd61cca6 Browse Files

15 May, 2020 4 commits
- 商家会处理退款申请，请稍后 · a98771cd
  xiaoer.li committed May 15, 2020
  
  a98771cd Browse Files
- 商家会处理退款申请，请稍后 · 60410235
  xiaoer.li committed May 15, 2020
  
  60410235 Browse Files
- 正在退款中，稍后金额会原路退回退款状态 · a658d016
  xiaoer.li committed May 15, 2020
  
  a658d016 Browse Files
- 退款中的订单提示统一改成正在退款中，请稍等 · 9bda6fe5
  xiaoer.li@freemud.com committed May 15, 2020
  
  9bda6fe5 Browse Files
14 May, 2020 6 commits
- 重新增加退款相关文字描述 · 588136dc
  xiaoer.li@freemud.com committed May 14, 2020
  
  588136dc Browse Files
- 增加售后阶段 · 191c259c
  姜海波 committed May 14, 2020
  
  191c259c Browse Files
- 增加售后阶段 · b1977401
  姜海波 committed May 14, 2020
  
  b1977401 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature-2020/5/7-1.9.22-售后ES查询增加阶段条件-海波' · e6086ea5
  姜海波 committed May 14, 2020
  
  e6086ea5 Browse Files
- 退款中文案描述 · 4460b7cb
  xiaoer.li@freemud.com committed May 14, 2020
  
  4460b7cb Browse Files
- 增加退款提示refundTips · 4658432e
  xiaoer.li@freemud.com committed May 14, 2020
  
  4658432e Browse Files
12 May, 2020 24 commits
- Merge branch 'feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into develop · bdd40b13
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  姜海波 committed May 12, 2020
  bdd40b13 Browse Files
- 退配送费增加订单状态审核 · eb08e70d
  姜海波 committed May 12, 2020
  
  eb08e70d Browse Files
- 退配送费增加订单状态审核 · 8c68fb46
  姜海波 committed May 12, 2020
  
  8c68fb46 Browse Files
- Merge branch 'feature/20200423_订单oms逆向流程' · 6bdbb7e6
```
# Conflicts:
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed May 12, 2020
  6bdbb7e6 Browse Files
- 移动order-management依赖位置，解决自定义异常拦截器和commons-base中异常拦截冲突 · d57afda9
  shuhu.hou@freemud.cn committed May 12, 2020
  
  d57afda9 Browse Files
- Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'master' of… · bbc23cc4
```
Merge branches 'feature/20200423_蜜雪新下单接口_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed May 12, 2020
  bbc23cc4 Browse Files
- 商品不存在提示 · f41f2bdd
  ping.wu committed May 12, 2020
  
  f41f2bdd Browse Files
- 申请退款接口切换sdk升级 · 1cfa3eb5
  ping.wu committed May 12, 2020
  
  1cfa3eb5 Browse Files
- Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of… · 8d1fe551
```
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
```
  ping.wu committed May 12, 2020
  8d1fe551 Browse Files
- 退配送费增加订单状态审核 · 9dfce6fc
  姜海波 committed May 12, 2020
  
  9dfce6fc Browse Files
- 申请退款换取消接口超时时间设置 · 78d7e4b8
  ping.wu committed May 12, 2020
  
  78d7e4b8 Browse Files
- 非空参数校验 · b14a29df
  ping.wu committed May 12, 2020
  
  b14a29df Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' · 15984828
  dingkai committed May 12, 2020
  
  15984828 Browse Files
- 删除不使用的import · 65e67bec
  dingkai committed May 12, 2020
  
  65e67bec Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' · e7b6b1cc
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  dingkai committed May 12, 2020
  e7b6b1cc Browse Files
- 删除日志 · 86bd4277
  dingkai committed May 12, 2020
  
  86bd4277 Browse Files
- Revert "添加日志，测试完回滚" · 8724c327
```
This reverts commit a60bc75c
```
  张明警 committed May 12, 2020
  8724c327 Browse Files
- Revert "添加日志，测试完回滚" · a935c323
```
This reverts commit f282a45e
```
  张明警 committed May 12, 2020
  a935c323 Browse Files
- 添加日志，测试完回滚 · f282a45e
  张明警 committed May 12, 2020
  
  f282a45e Browse Files
- 退单增加是否退运费配置 · 7911db59
  姜海波 committed May 12, 2020
  
  7911db59 Browse Files
- 添加日志，测试完回滚 · a60bc75c
  张明警 committed May 12, 2020
  
  a60bc75c Browse Files
- 支付sdk异常日志 · a5175c53
  dingkai committed May 12, 2020
  
  a5175c53 Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' · 8130113e
  dingkai committed May 12, 2020
  
  8130113e Browse Files
- 支付sdk异常日志 · 35730e2e
  dingkai committed May 12, 2020
  
  35730e2e Browse Files