Commits · 6d43652d1f216796e6e078db8f1f7fedc15f3db8 · order-group-application / order-group · GitLab

09 Oct, 2023 2 commits
- Merge branch 'feature/20231008_小助手审核线下订单退款问题修复_wuping' of… · 6d43652d
```
Merge branch 'feature/20231008_小助手审核线下订单退款问题修复_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Oct 09, 2023
  6d43652d Browse Files
- 去除支付方式（线下）才走支付退款判断 · 93b67d9f
  ping.wu committed Oct 09, 2023
  
  93b67d9f Browse Files
08 Oct, 2023 3 commits
- Merge branch 'feature/rui.zhu/退款接口逻辑调整' into qa · 6e8478f1
  rui.zhu committed Oct 08, 2023
  
  6e8478f1 Browse Files
- Merge branch 'master' into feature/rui.zhu/退款接口逻辑调整 · b6319a03
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/RefundService.java
```
  rui.zhu committed Oct 08, 2023
  b6319a03 Browse Files
- 修复未接单订单显示为部分退问题 · cb52e1b2
  rui.zhu committed Oct 08, 2023
  
  cb52e1b2 Browse Files
28 Sep, 2023 5 commits
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · 842a7544
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Sep 28, 2023
  842a7544 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · da31c3f2
  ping.wu committed Sep 28, 2023
  
  da31c3f2 Browse Files
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · 2b87325a
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Sep 28, 2023
  2b87325a Browse Files
- 支付宝上报推支付不再推生态 · ca5e1ce5
  ping.wu committed Sep 28, 2023
  
  ca5e1ce5 Browse Files
- Merge branch 'feature/rui.zhu/退款接口逻辑调整' into qa · d4e0bc6b
  rui.zhu committed Sep 28, 2023
  
  d4e0bc6b Browse Files
25 Sep, 2023 2 commits
- Merge branch 'master' into qa · d6ff47cb
  rui.zhu committed Sep 25, 2023
  
  d6ff47cb Browse Files
- 修复未接单订单退款后未回滚部分数据 · 241ee3dd
  rui.zhu committed Sep 25, 2023
  
  241ee3dd Browse Files
21 Sep, 2023 1 commit
- C端退款接口逻辑调整 · e0fad7f2
  rui.zhu committed Sep 21, 2023
  
  e0fad7f2 Browse Files
24 Aug, 2023 1 commit
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · c5352e97
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 24, 2023
  c5352e97 Browse Files
23 Aug, 2023 2 commits
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · dd2e7918
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 23, 2023
  dd2e7918 Browse Files
- 支付宝上报返佣新增取餐号与修改时间字段 · 7cc5894f
  ping.wu committed Aug 23, 2023
  
  7cc5894f Browse Files
22 Aug, 2023 3 commits
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · 054396ee
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Aug 22, 2023
  054396ee Browse Files
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · bec72c77
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 22, 2023
  bec72c77 Browse Files
- 售后订单取最新售后数据 · 3d6ba3d3
  ping.wu committed Aug 22, 2023
  
  3d6ba3d3 Browse Files
18 Aug, 2023 6 commits
- Merge branch 'feature/售后单记录支付信息' · 48e7569d
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  rui.zhu committed Aug 19, 2023
  48e7569d Browse Files
- fix npe · 811dc64c
  rui.zhu committed Aug 19, 2023
  
  811dc64c Browse Files
- fix npe · 9ed15c93
  rui.zhu committed Aug 18, 2023
  
  9ed15c93 Browse Files
- 生产问题debug · 826e558f
  rui.zhu committed Aug 18, 2023
  
  826e558f Browse Files
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · 7297c701
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 18, 2023
  7297c701 Browse Files
- 支付上报新增orderClient · d08dd5fa
  ping.wu committed Aug 18, 2023
  
  d08dd5fa Browse Files
17 Aug, 2023 15 commits
- Merge branch 'feature/售后单记录支付信息' into qa · 9f5e041c
  rui.zhu committed Aug 17, 2023
  
  9f5e041c Browse Files
- Merge branch 'feature/售后单记录支付信息' · 81f93bb8
  rui.zhu committed Aug 17, 2023
  
  81f93bb8 Browse Files
- 退款现金类型可能存在错误 · f2b9e827
  rui.zhu committed Aug 17, 2023
  
  f2b9e827 Browse Files
- Merge branch 'feature/售后单记录支付信息' of https://gitlab.freemud.com/order-group-application/order-group · 631a729b
  ping.wu committed Aug 17, 2023
  
  631a729b Browse Files
- Merge branch 'feature/售后单记录支付信息' of… · 6e503444
```
Merge branch 'feature/售后单记录支付信息' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 17, 2023
  6e503444 Browse Files
- 支付方式其他 · 45a19b96
  ping.wu committed Aug 17, 2023
  
  45a19b96 Browse Files
- Merge branch 'feature/售后单记录支付信息' · 426463ad
  rui.zhu committed Aug 17, 2023
  
  426463ad Browse Files
- Merge branch 'feature/售后单记录支付信息' into qa · 8389e858
  rui.zhu committed Aug 17, 2023
  
  8389e858 Browse Files
- refactor:修改退款明细中的支付渠道和名称的获取逻辑 · 8bbb6f78
  rui.zhu committed Aug 17, 2023
  
  8bbb6f78 Browse Files
- fix:修复线下混合支付退款空指针 · 24f2cebc
  rui.zhu committed Aug 17, 2023
  
  24f2cebc Browse Files
- Merge branch 'feature/售后单记录支付信息' into qa · e2667f49
  rui.zhu committed Aug 17, 2023
  
  e2667f49 Browse Files
- debug · 947344c3
  rui.zhu committed Aug 17, 2023
  
  947344c3 Browse Files
- Merge branch 'feature/售后单记录支付信息' · 242b7bcb
  rui.zhu committed Aug 17, 2023
  
  242b7bcb Browse Files
- Merge branch 'feature/售后单记录支付信息' into qa · 767888dc
  rui.zhu committed Aug 17, 2023
  
  767888dc Browse Files
- 增加翼支付枚举 · a42067fd
  rui.zhu committed Aug 17, 2023
  
  a42067fd Browse Files