Commits · 1f54062353925aa0087b254092891227b42eac4e · order-group-application / order-group · GitLab

28 Dec, 2023 2 commits
- Merge branch 'feature/box/券包退款' into develop · 1f540623
  box committed Dec 28, 2023
  
  1f540623 Browse Files
- 同意退款申请时，如果是买券订单，作废券 · 1bb497d9
```
拒绝退款申请时，如果是买券订单，解冻券
```
  box committed Dec 28, 2023
  1bb497d9 Browse Files
27 Dec, 2023 5 commits
- Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of… · 5b41ab99
```
Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Dec 27, 2023
  5b41ab99 Browse Files
- 订单宝暂无appid，返回支付关联的appid用于储值校验记录支付退款用 · 26c4a61e
  ping.wu committed Dec 27, 2023
  
  26c4a61e Browse Files
- 订单宝暂无appid，返回支付关联的appid用于储值校验记录支付退款用 · 4fbdf910
  ping.wu committed Dec 27, 2023
  
  4fbdf910 Browse Files
- Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of… · 8c0a65b3
```
Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Dec 27, 2023
  8c0a65b3 Browse Files
- 订单宝购买储值卡支付虚拟门店，订单宝暂无appid · 31bbed7c
  ping.wu committed Dec 27, 2023
  
  31bbed7c Browse Files
14 Dec, 2023 3 commits
- Merge branch 'master' into develop · a1d5252b
  rui.zhu committed Dec 14, 2023
  
  a1d5252b Browse Files
- Merge remote-tracking branch 'origin/master' · c2fc4bc7
  rui.zhu committed Dec 14, 2023
  
  c2fc4bc7 Browse Files
- 修复礼品卡申请退款，无法通过退款 · 114026e4
  rui.zhu committed Dec 14, 2023
  
  114026e4 Browse Files
11 Dec, 2023 4 commits
- Merge branch 'feature/box/查卡包链路优化' into develop · 850eff85
  box committed Dec 11, 2023
  
  850eff85 Browse Files
- 启用金额校验 · 9007e5a0
  box committed Dec 11, 2023
  
  9007e5a0 Browse Files
- Merge branch 'feature/box/查卡包链路优化' into develop · cdfec6e0
  box committed Dec 11, 2023
  
  cdfec6e0 Browse Files
- feature/box/查卡包链路优化 · 840ea36e
  box committed Dec 11, 2023
  
  840ea36e Browse Files
30 Nov, 2023 2 commits
- Merge branch 'master' into develop · 874d720e
  rui.zhu committed Nov 30, 2023
  
  874d720e Browse Files
- 随单买卡订单取消未退券 · 05359cb9
  rui.zhu committed Nov 30, 2023
  
  05359cb9 Browse Files
02 Nov, 2023 4 commits
- Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of… · e2c995a8
```
Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Nov 02, 2023
  e2c995a8 Browse Files
- redis序列号报错问题修改 · abe36a61
  ping.wu committed Nov 02, 2023
  
  abe36a61 Browse Files
- Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of… · ba5c12fe
```
Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Nov 02, 2023
  ba5c12fe Browse Files
- 升级分发器sdk，支持订单宝录入会员信息订单支持送积分经验值等 · 45b5ff3d
  ping.wu committed Nov 02, 2023
  
  45b5ff3d Browse Files
01 Nov, 2023 2 commits
- Merge branch 'feature/20231101_订单宝支付退款_wuping' of… · 0b374d9d
```
Merge branch 'feature/20231101_订单宝支付退款_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Nov 01, 2023
  0b374d9d Browse Files
- 订单宝支付退款走混合支付退款 · 2118bb59
  ping.wu committed Nov 01, 2023
  
  2118bb59 Browse Files
25 Oct, 2023 1 commit
- Merge branch 'feature/rui.zhu/退款接口逻辑调整' · 0c96f890
  rui.zhu committed Oct 25, 2023
  
  0c96f890 Browse Files
09 Oct, 2023 1 commit
- 去除支付方式（线下）才走支付退款判断 · 93b67d9f
  ping.wu committed Oct 09, 2023
  
  93b67d9f Browse Files
08 Oct, 2023 3 commits
- Merge branch 'feature/rui.zhu/退款接口逻辑调整' into develop · 4ff89491
  rui.zhu committed Oct 08, 2023
  
  4ff89491 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 2 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
- 支付宝上报推支付不再推生态 · ca5e1ce5
  ping.wu committed Sep 28, 2023
  
  ca5e1ce5 Browse Files
25 Sep, 2023 2 commits
- Merge branch 'master' into develop · 10167812
  rui.zhu committed Sep 25, 2023
  
  10167812 Browse Files
- 修复未接单订单退款后未回滚部分数据 · 241ee3dd
  rui.zhu committed Sep 25, 2023
  
  241ee3dd Browse Files
21 Sep, 2023 2 commits
- Merge branch 'feature/rui.zhu/退款接口逻辑调整' into develop · 768a2c79
  rui.zhu committed Sep 21, 2023
  
  768a2c79 Browse Files
- 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 1 commit
- 支付宝上报返佣新增取餐号与修改时间字段 · 7cc5894f
  ping.wu committed Aug 23, 2023
  
  7cc5894f Browse Files
22 Aug, 2023 2 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
- 售后订单取最新售后数据 · 3d6ba3d3
  ping.wu committed Aug 22, 2023
  
  3d6ba3d3 Browse Files
18 Aug, 2023 3 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