Commits · d8555c6f907c49470e6a672f4f924d32c97564ae · order-group-application / order-group

21 Jun, 2022 4 commits
- Merge branch 'KA-新增同意退款回调逻辑处理' into develop · d8555c6f
```
# 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 21, 2022
  d8555c6f Browse Files
- 退款失败不应该走冲正逻辑 · 3a05bff8
  周晓航 committed Jun 21, 2022
  
  3a05bff8 Browse Files
- Merge branch 'KA-测试购物车list不重复调用' into develop · 41e22678
  周晓航 committed Jun 21, 2022
  
  41e22678 Browse Files
- 老算价,购物车优化修改 · c1238b6a
  周晓航 committed Jun 21, 2022
  
  c1238b6a Browse Files
17 Jun, 2022 3 commits
- Merge branch 'bugfix-门店未配置业务导致订单NPE' into develop · aaae294b
  周晓航 committed Jun 17, 2022
  
  aaae294b Browse Files
- 修复生产bug-> 门店未有任何配置导致购物车计算配送费NPE · 364f9431
  周晓航 committed Jun 17, 2022
  
  364f9431 Browse Files
- 修复生产bug-> 门店未有任何配置导致购物车计算配送费NPE · e1601f3c
  周晓航 committed Jun 17, 2022
  
  e1601f3c Browse Files
14 Jun, 2022 4 commits
- Merge branch '紧急优化codev4接口-20220614' into 'master' · f10d0997
```
购物车优化 codev4调用传递商品id

See merge request !143
```
  缪晖 committed Jun 14, 2022
  f10d0997 Browse Files
- 拦截重复点击 · bfd25c88
  周晓航 committed Jun 14, 2022
  
  bfd25c88 Browse Files
- 购物车优化 codev4调用传递商品id · a35c7e29
  周晓航 committed Jun 14, 2022
  
  a35c7e29 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/Ka3.0.4.1-0613-0620-爱马哥低碳活动' · 9ed1ba15
  胡敬轩 committed Jun 14, 2022
  
  9ed1ba15 Browse Files
13 Jun, 2022 8 commits
- 修复购物车不能带券加车的问题 · 8b2c3915
  查志伟 committed Jun 14, 2022
  
  8b2c3915 Browse Files
- 优化NPE · 85ba6314
  周晓航 committed Jun 13, 2022
  
  85ba6314 Browse Files
- 购物车下单无效商品问题修复 · aab02add
  查志伟 committed Jun 13, 2022
  
  aab02add Browse Files
- 微商城订单处理因为没有appid不上报 · 7090e259
  胡敬轩 committed Jun 13, 2022
  
  7090e259 Browse Files
- 新增未接单的退款售后处理逻辑 · 6111c8d6
  周晓航 committed Jun 13, 2022
  
  6111c8d6 Browse Files
- Merge branches 'feature/20220524_新商城_wuping' and 'master' of… · 8b57fa97
```
Merge branches 'feature/20220524_新商城_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 13, 2022
  8b57fa97 Browse Files
- 退款没拦截成功的优化 · 269947c8
  周晓航 committed Jun 13, 2022
  
  269947c8 Browse Files
- 服务端处理购物车商品删除返回前端数据不一致情况 · e60f6782
  周晓航 committed Jun 13, 2022
  
  e60f6782 Browse Files
10 Jun, 2022 9 commits
- 商城混合支付退款 · 6d85cea6
  ping.wu committed Jun 10, 2022
  
  6d85cea6 Browse Files
- 测试返回true 前端是否会重新请求 · 81642811
  周晓航 committed Jun 10, 2022
  
  81642811 Browse Files
- 退款失败处理 · 1fdde2ea
  ping.wu committed Jun 10, 2022
  
  1fdde2ea Browse Files
- 三方流水号赋值错误 · 6a5971fe
  胡敬轩 committed Jun 10, 2022
  
  6a5971fe Browse Files
- 支付回调接口修改优化 · 77126629
  周晓航 committed Jun 10, 2022
  
  77126629 Browse Files
- Merge branch '【【华莱士】需求查看过去三个月的订单】' into develop · a03c800f
  周晓航 committed Jun 10, 2022
  
  a03c800f Browse Files
- 【华莱士】需求查看过去三个月的订单 · a84e09cc
  周晓航 committed Jun 10, 2022
  
  a84e09cc Browse Files
- 【华莱士】需求查看过去三个月的订单 · 220288db
  周晓航 committed Jun 10, 2022
  
  220288db Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · 93794d7c
  胡敬轩 committed Jun 10, 2022
  
  93794d7c Browse Files
09 Jun, 2022 9 commits
- Merge branch '【【华莱士】需求查看过去三个月的订单】' into develop · bad6afcd
  周晓航 committed Jun 09, 2022
  
  bad6afcd Browse Files
- 【华莱士】需求查看过去三个月的订单 · b5372d17
  周晓航 committed Jun 09, 2022
  
  b5372d17 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 '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
- 爱马哥低碳活动活动结束即可删除此代码 · a1f4e4da
  胡敬轩 committed Jun 09, 2022
  
  a1f4e4da Browse Files
- 爱马哥低碳活动活动结束即可删除此代码 · a9834867
  胡敬轩 committed Jun 09, 2022
  
  a9834867 Browse Files
08 Jun, 2022 3 commits

Merge branches 'develop' and 'feature/20220524_新商城_wuping' of… · e2e120b2

Merge branches 'develop' and 'feature/20220524_新商城_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

committed Jun 08, 2022

e2e120b2 Browse Files

优化消息发送代码 · 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