Commits · 4e8ed946da8666d12c520ce21a36e672bac5817d · order-group-application / order-group · GitLab

23 Jun, 2022 2 commits
- 拦截卖券订单不走支付回调补偿 · 4e8ed946
  周晓航 committed Jun 23, 2022
  
  4e8ed946 Browse Files
- 拦截卖券订单不走支付回调补偿 · d76e8f43
  周晓航 committed Jun 23, 2022
  
  d76e8f43 Browse Files
22 Jun, 2022 5 commits
- 处理退款支付异常的情况, 订单流程不往下走 · 36206fe2
  周晓航 committed Jun 22, 2022
  
  36206fe2 Browse Files
- 处理退款支付异常的情况, 订单流程不往下走 · 8e59b094
  周晓航 committed Jun 22, 2022
  
  8e59b094 Browse Files
- final.拦截退款失败,逻辑不往下走 · c0ebacdf
  周晓航 committed Jun 22, 2022
  
  c0ebacdf Browse Files
- final.拦截退款失败,逻辑不往下走 · 4c8ad19e
  周晓航 committed Jun 22, 2022
  
  4c8ad19e Browse Files
- 按照原有逻辑,无需拦截 · 9fffb199
  周晓航 committed Jun 22, 2022
  
  9fffb199 Browse Files
21 Jun, 2022 1 commit
- 退款失败不应该走冲正逻辑 · 3a05bff8
  周晓航 committed Jun 21, 2022
  
  3a05bff8 Browse Files
14 Jun, 2022 1 commit
- 拦截重复点击 · bfd25c88
  周晓航 committed Jun 14, 2022
  
  bfd25c88 Browse Files
13 Jun, 2022 2 commits
- 新增未接单的退款售后处理逻辑 · 6111c8d6
  周晓航 committed Jun 13, 2022
  
  6111c8d6 Browse Files
- 退款没拦截成功的优化 · 269947c8
  周晓航 committed Jun 13, 2022
  
  269947c8 Browse Files
10 Jun, 2022 1 commit
- 支付回调接口修改优化 · 77126629
  周晓航 committed Jun 10, 2022
  
  77126629 Browse Files
09 Jun, 2022 4 commits
- 【订C】新增订单退款成功回调接口，需要修改售后单状态（原因:发起退款时支付那边可能是退款中状态，定时任务补偿后需要回调订单） · 81f9bfbe
  周晓航 committed Jun 09, 2022
  
  81f9bfbe Browse Files
- Merge branch 'master' into KA-新增同意退款回调逻辑处理 · a068ef59
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  周晓航 committed Jun 09, 2022
  a068ef59 Browse Files
- 【订C】新增订单退款成功回调接口，需要修改售后单状态（原因:发起退款时支付那边可能是退款中状态，定时任务补偿后需要回调订单） · 7fbd20e9
  周晓航 committed Jun 09, 2022
  
  7fbd20e9 Browse Files
- 【订C】新增订单退款成功回调接口，需要修改售后单状态（原因:发起退款时支付那边可能是退款中状态，定时任务补偿后需要回调订单） · b2aab53f
  周晓航 committed Jun 09, 2022
  
  b2aab53f Browse Files
08 Jun, 2022 2 commits
- 优化消息发送代码 · b85b4c71
  周晓航 committed Jun 08, 2022
  
  b85b4c71 Browse Files
- Merge branches 'feature/20220606_支付退款状态码_wuping' and 'master' of… · e94c8266
```
Merge branches 'feature/20220606_支付退款状态码_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 08, 2022
  e94c8266 Browse Files
07 Jun, 2022 1 commit
- Merge branch 'Bugfix-日志报错问题修复20220601' into 'master' · b08a4d7c
```
Bugfix 日志报错问题修复20220601

See merge request !142
```
  缪晖 committed Jun 07, 2022
  b08a4d7c Browse Files
06 Jun, 2022 1 commit
- 支付状态码取内部值 · 760f8f67
  ping.wu committed Jun 06, 2022
  
  760f8f67 Browse Files
01 Jun, 2022 2 commits
- 日志问题导致无效告警 · d5b440c7
  周晓航 committed Jun 01, 2022
  
  d5b440c7 Browse Files
- 日志问题导致无效告警 · a148686f
  周晓航 committed Jun 01, 2022
  
  a148686f Browse Files
30 May, 2022 1 commit
- 支付关单内层code判断 · c1af8397
  ping.wu committed May 30, 2022
  
  c1af8397 Browse Files
27 May, 2022 3 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into 'master' · c619d0bf
```
Ka 储值卡增加营销规则同享配置id1046436 zxh 20220505

See merge request !141
```
  缪晖 committed May 27, 2022
  c619d0bf Browse Files
- 删除日志 · 3062bc5e
  周晓航 committed May 27, 2022
  
  3062bc5e Browse Files
- 卖券订单储值卡互斥规则 · de263677
  周晓航 committed May 27, 2022
  
  de263677 Browse Files
26 May, 2022 14 commits
- Merge branch 'KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into 'master' · 0a0a9873
```
Ka 储值卡增加营销规则同享配置id1046436 zxh 20220505

See merge request !140
```
  缪晖 committed May 27, 2022
  0a0a9873 Browse Files
- 删除无效日志 · 1d25657c
  周晓航 committed May 27, 2022
  
  1d25657c Browse Files
- Merge remote-tracking branch 'origin/KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505'… · bf609f87
```
Merge remote-tracking branch 'origin/KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505' into KA-储值卡增加营销规则同享配置ID1046436-zxh-20220505
```
  周晓航 committed May 27, 2022
  bf609f87 Browse Files
- 新增一个main 测试 · 1ee4ff6f
  周晓航 committed May 27, 2022
  
  1ee4ff6f Browse Files
- 打日志 · bcb6496b
  周晓航 committed May 27, 2022
  
  bcb6496b Browse Files
- 打日志 · dd7ec333
  周晓航 committed May 26, 2022
  
  dd7ec333 Browse Files
- 打日志 · 50dc4685
  周晓航 committed May 26, 2022
  
  50dc4685 Browse Files
- 打个日志 · 2784e586
  周晓航 committed May 26, 2022
  
  2784e586 Browse Files
- Merge branch 'KA-顺丰计算商品重量的情况-20220517' into 'master' · 2ed6e031
```
Ka 顺丰计算商品重量的情况 20220517

See merge request !139
```
  缪晖 committed May 26, 2022
  2ed6e031 Browse Files
- 删除无效日志 · 8327b59c
  周晓航 committed May 26, 2022
  
  8327b59c Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · 3529be88
  周晓航 committed May 26, 2022
  
  3529be88 Browse Files
- 当前时间点默认走同享逻辑上线 2022年5月26日17:23:00 · f17f2564
  周晓航 committed May 26, 2022
  
  f17f2564 Browse Files
- 临时优化,卡配置互斥的情况导致购物车返回数据不对, · f638ae41
```
解决方案: 先自己重新请求一次购物车
```
  周晓航 committed May 26, 2022
  f638ae41 Browse Files
- 打个日志 · fdb37cd6
  周晓航 committed May 26, 2022
  
  fdb37cd6 Browse Files