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

29 Jun, 2022 2 commits
- Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of… · f3f9b5eb
```
Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 29, 2022
  f3f9b5eb Browse Files
- 退款最新售后单判断 · 8fe54e44
  ping.wu committed Jun 29, 2022
  
  8fe54e44 Browse Files
24 Jun, 2022 8 commits
- Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of… · 7232b6aa
```
Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 24, 2022
  7232b6aa Browse Files
- 支付退款失败才记录失败原因．售后单审核中和退货中都可以同意退款 · 71b38b4e
  ping.wu committed Jun 24, 2022
  
  71b38b4e Browse Files
- Merge branch '小助手门店操作退款-oms-基于pre分支' into qa · 45709e5f
  周晓航 committed Jun 24, 2022
  
  45709e5f Browse Files
- 移除无效oms · a3b39d3d
  周晓航 committed Jun 24, 2022
  
  a3b39d3d Browse Files
- Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of… · 4eb6aada
```
Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 24, 2022
  4eb6aada Browse Files
- 混合支付退款失败原因记录 · b7dbf687
  ping.wu committed Jun 24, 2022
  
  b7dbf687 Browse Files
- Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of… · a390aa19
```
Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
```
  ping.wu committed Jun 24, 2022
  a390aa19 Browse Files
- 指定包路径 · e0aec3a4
  ping.wu committed Jun 24, 2022
  
  e0aec3a4 Browse Files
23 Jun, 2022 12 commits
- 门店小助手不能操作需要品牌审核的售后单 · b37a282f
  ping.wu committed Jun 23, 2022
  
  b37a282f Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 5a9ba160
  周晓航 committed Jun 23, 2022
  
  5a9ba160 Browse Files
- 拦截卖券订单不走支付回调补偿 · d76e8f43
  周晓航 committed Jun 23, 2022
  
  d76e8f43 Browse Files
- Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'pre' of… · 49c5bb31
```
Merge branches 'feature/20220622_退款失败记录到订单_wuping' and 'pre' of http://gitlab.freemud.com/order-group-application/order-group into feature/20220622_退款失败记录到订单_wuping
```
  ping.wu committed Jun 23, 2022
  49c5bb31 Browse Files
- 支付退款代码整理 · ed597807
  ping.wu committed Jun 23, 2022
  
  ed597807 Browse Files
- Merge branch '小助手门店操作退款-oms-基于pre分支' into qa · 3912c5a5
  周晓航 committed Jun 23, 2022
  
  3912c5a5 Browse Files
- Merge branch 'master' into 小助手门店操作退款-oms-基于pre分支 · fada700f
  周晓航 committed Jun 23, 2022
  
  fada700f Browse Files
- 1.删除无效代码 · 468a7dfe
```
2.留备注
```
  周晓航 committed Jun 23, 2022
  468a7dfe Browse Files
- Merge branch '小助手门店操作退款-oms-基于pre分支' into qa · d0270856
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  周晓航 committed Jun 23, 2022
  d0270856 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' · eb526c7f
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
```
  周晓航 committed Jun 23, 2022
  eb526c7f Browse Files
- Merge branch 'KA-消费黑名单订单限制-20220527' · e1acc3f3
  周晓航 committed Jun 23, 2022
  
  e1acc3f3 Browse Files
- 退款失败记录到订单售后单 · 622d5753
  ping.wu committed Jun 23, 2022
  
  622d5753 Browse Files
22 Jun, 2022 18 commits
- 1.删除无效代码 · 892f9500
```
2.留备注
```
  周晓航 committed Jun 22, 2022
  892f9500 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · 16b464ad
  胡敬轩 committed Jun 22, 2022
  
  16b464ad Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into pre · b140bf83
  胡敬轩 committed Jun 22, 2022
  
  b140bf83 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · 0067cb91
  胡敬轩 committed Jun 22, 2022
  
  0067cb91 Browse Files
- 低碳活动用户未报名活动的过滤掉 · f44c4045
  胡敬轩 committed Jun 22, 2022
  
  f44c4045 Browse Files
- 新增oms操作 · 8abf3d5d
  周晓航 committed Jun 22, 2022
  
  8abf3d5d Browse Files
- Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'qa' of… · 8815536b
```
Merge branches 'feature/20220621_门店小助手退款处理_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 22, 2022
  8815536b Browse Files
- 多卡支付混合支付接口新增参数 · 0cbcafd0
  ping.wu committed Jun 22, 2022
  
  0cbcafd0 Browse Files
- Merge branch 'master' of… · 68d737fe
```
Merge branch 'master' of http://gitlab.freemud.com/order-group-application/order-group into 小助手门店操作退款-oms-基于pre分支
```
  周晓航 committed Jun 22, 2022
  68d737fe Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · ddd8fefa
  周晓航 committed Jun 22, 2022
  
  ddd8fefa Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into pre · c98138b8
  周晓航 committed Jun 22, 2022
  
  c98138b8 Browse Files
- 处理退款支付异常的情况, 订单流程不往下走 · 36206fe2
  周晓航 committed Jun 22, 2022
  
  36206fe2 Browse Files
- 处理退款支付异常的情况, 订单流程不往下走 · 8e59b094
  周晓航 committed Jun 22, 2022
  
  8e59b094 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into pre · d0c977f6
  周晓航 committed Jun 22, 2022
  
  d0c977f6 Browse Files
- final.拦截退款失败,逻辑不往下走 · c0ebacdf
  周晓航 committed Jun 22, 2022
  
  c0ebacdf Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 5a92946e
  周晓航 committed Jun 22, 2022
  
  5a92946e Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into pre · 69c630a0
  周晓航 committed Jun 22, 2022
  
  69c630a0 Browse Files
- final.拦截退款失败,逻辑不往下走 · 4c8ad19e
  周晓航 committed Jun 22, 2022
  
  4c8ad19e Browse Files