Commits · 29f6e22e0961af5e63a7d85d2b6562395e8545c7 · order-group-application / order-group · GitLab

13 Jun, 2022 9 commits
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 29f6e22e
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
```
  周晓航 committed Jun 13, 2022
  29f6e22e Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · df51f73b
  胡敬轩 committed Jun 13, 2022
  
  df51f73b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · eb1933ee
  胡敬轩 committed Jun 13, 2022
  
  eb1933ee Browse Files
- 微商城订单处理因为没有appid不上报 · 7090e259
  胡敬轩 committed Jun 13, 2022
  
  7090e259 Browse Files
- 新增未接单的退款售后处理逻辑 · 6111c8d6
  周晓航 committed Jun 13, 2022
  
  6111c8d6 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 53e962c3
  周晓航 committed Jun 13, 2022
  
  53e962c3 Browse Files
- 退款没拦截成功的优化 · 269947c8
  周晓航 committed Jun 13, 2022
  
  269947c8 Browse Files
- Merge branch 'KA-测试购物车list不重复调用' into qa · 036fe79c
  周晓航 committed Jun 13, 2022
  
  036fe79c Browse Files
- 服务端处理购物车商品删除返回前端数据不一致情况 · e60f6782
  周晓航 committed Jun 13, 2022
  
  e60f6782 Browse Files
10 Jun, 2022 18 commits
- Merge branches 'feature/20220524_新商城_wuping' and 'qa' of… · db429da2
```
Merge branches 'feature/20220524_新商城_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 10, 2022
  db429da2 Browse Files
- 商城混合支付退款 · 6d85cea6
  ping.wu committed Jun 10, 2022
  
  6d85cea6 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · ceae009f
  周晓航 committed Jun 10, 2022
  
  ceae009f Browse Files
- Merge branch 'KA-测试购物车list不重复调用' into qa · 5b3d2b9a
  周晓航 committed Jun 10, 2022
  
  5b3d2b9a Browse Files
- 测试返回true 前端是否会重新请求 · 81642811
  周晓航 committed Jun 10, 2022
  
  81642811 Browse Files
- Merge branches 'feature/20220524_新商城_wuping' and 'qa' of… · 2b44baba
```
Merge branches 'feature/20220524_新商城_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 10, 2022
  2b44baba Browse Files
- 退款失败处理 · 1fdde2ea
  ping.wu committed Jun 10, 2022
  
  1fdde2ea Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · 4b189bb6
  胡敬轩 committed Jun 10, 2022
  
  4b189bb6 Browse Files
- 三方流水号赋值错误 · 6a5971fe
  胡敬轩 committed Jun 10, 2022
  
  6a5971fe Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 86a7ddff
  周晓航 committed Jun 10, 2022
  
  86a7ddff Browse Files
- 支付回调接口修改优化 · 77126629
  周晓航 committed Jun 10, 2022
  
  77126629 Browse Files
- Merge branch '【【华莱士】需求查看过去三个月的订单】' into qa · 3ca478b7
  周晓航 committed Jun 10, 2022
  
  3ca478b7 Browse Files
- 【华莱士】需求查看过去三个月的订单 · a84e09cc
  周晓航 committed Jun 10, 2022
  
  a84e09cc Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · c0f2ab0c
  周晓航 committed Jun 10, 2022
  
  c0f2ab0c Browse Files
- Merge branch '【【华莱士】需求查看过去三个月的订单】' into qa · 7cb853ca
  周晓航 committed Jun 10, 2022
  
  7cb853ca Browse Files
- 【华莱士】需求查看过去三个月的订单 · 220288db
  周晓航 committed Jun 10, 2022
  
  220288db Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · 6fbe390e
  胡敬轩 committed Jun 10, 2022
  
  6fbe390e Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · 93794d7c
  胡敬轩 committed Jun 10, 2022
  
  93794d7c Browse Files
09 Jun, 2022 13 commits
- Merge branch '【【华莱士】需求查看过去三个月的订单】' into qa · 4cd1e8fc
  周晓航 committed Jun 09, 2022
  
  4cd1e8fc Browse Files
- 【华莱士】需求查看过去三个月的订单 · b5372d17
  周晓航 committed Jun 09, 2022
  
  b5372d17 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · 0851b692
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  周晓航 committed Jun 09, 2022
  0851b692 Browse Files
- 【订C】新增订单退款成功回调接口，需要修改售后单状态（原因:发起退款时支付那边可能是退款中状态，定时任务补偿后需要回调订单） · 81f9bfbe
  周晓航 committed Jun 09, 2022
  
  81f9bfbe Browse Files
- Merge branches 'feature/20220524_新商城_wuping' and 'master' of… · 447d6b92
```
Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 09, 2022
  447d6b92 Browse Files
- Merge branch 'KA-新增同意退款回调逻辑处理' into qa · e833516b
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
```
  周晓航 committed Jun 09, 2022
  e833516b 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
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · 77a4b4d7
  胡敬轩 committed Jun 09, 2022
  
  77a4b4d7 Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · a1f4e4da
  胡敬轩 committed Jun 09, 2022
  
  a1f4e4da Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' into qa · 3d11ff5e
  胡敬轩 committed Jun 09, 2022
  
  3d11ff5e Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · a9834867
  胡敬轩 committed Jun 09, 2022
  
  a9834867 Browse Files