Commits · 2eb29f36fcda270a549e37d38ddeb15ad9cd4b8c · order-group-application / order-group · GitLab

04 Jan, 2024 3 commits
- Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of… · 2eb29f36
```
Merge branch 'feature/20231227_订单宝储值虚拟门店查询_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jan 04, 2024
  2eb29f36 Browse Files
- Merge branch 'feature/20240104_美团外卖出餐限制一分钟_wuping' of… · 20199851
```
Merge branch 'feature/20240104_美团外卖出餐限制一分钟_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jan 04, 2024
  20199851 Browse Files
- 美团规定，一分钟内不能出餐 · 73d94a25
  ping.wu committed Jan 04, 2024
  
  73d94a25 Browse Files
03 Jan, 2024 2 commits
- Merge branch 'feature/box/券包退款' into qa · ad7259a0
  box committed Jan 03, 2024
  
  ad7259a0 Browse Files
- 卖券订单退款时，由于退款失败率更高，故逻辑修改为先退款再作废优惠券 · 8c6db0e2
```
那么如果退款成功，优惠券必须作废，因此移除优惠券作废前校验是否可以作废的逻辑
即不管券状态是否已使用还是部分使用，通通作废
```
  box committed Jan 03, 2024
  8c6db0e2 Browse Files
02 Jan, 2024 7 commits
- Merge branch 'feature/box/券包退款' into qa · 1f5c2055
  box committed Jan 02, 2024
  
  1f5c2055 Browse Files
- fixbug · 6d01bc42
  box committed Jan 02, 2024
  
  6d01bc42 Browse Files
- Merge branch 'feature/box/券包退款' into qa · c466acd8
  box committed Jan 02, 2024
  
  c466acd8 Browse Files
- 申请退款冻结优惠券 · 06b843c5
  box committed Jan 02, 2024
  
  06b843c5 Browse Files
- Merge branch 'feature/box/券包退款' into qa · c7fec3f3
  box committed Jan 02, 2024
  
  c7fec3f3 Browse Files
- 券包订单退款审核 · 7f24c264
  box committed Jan 02, 2024
  
  7f24c264 Browse Files
- 同意退款校验卖券订单的券状态 · f2ea2732
  box committed Jan 02, 2024
  
  f2ea2732 Browse Files
28 Dec, 2023 1 commit
- 同意退款申请时，如果是买券订单，作废券 · 1bb497d9
```
拒绝退款申请时，如果是买券订单，解冻券
```
  box committed Dec 28, 2023
  1bb497d9 Browse Files
27 Dec, 2023 3 commits
- 订单宝暂无appid，返回支付关联的appid用于储值校验记录支付退款用 · 26c4a61e
  ping.wu committed Dec 27, 2023
  
  26c4a61e Browse Files
- 订单宝暂无appid，返回支付关联的appid用于储值校验记录支付退款用 · 4fbdf910
  ping.wu committed Dec 27, 2023
  
  4fbdf910 Browse Files
- 订单宝购买储值卡支付虚拟门店，订单宝暂无appid · 31bbed7c
  ping.wu committed Dec 27, 2023
  
  31bbed7c Browse Files
14 Dec, 2023 3 commits
- Merge branch 'master' into qa · 7b1b880b
  rui.zhu committed Dec 14, 2023
  
  7b1b880b 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 3 commits
- Merge branch 'feature/box/查卡包链路优化' into qa · 5702d44a
  box committed Dec 11, 2023
  
  5702d44a Browse Files
- 启用金额校验 · 9007e5a0
  box committed Dec 11, 2023
  
  9007e5a0 Browse Files
- feature/box/查卡包链路优化 · 840ea36e
  box committed Dec 11, 2023
  
  840ea36e Browse Files
30 Nov, 2023 2 commits
- Merge branch 'master' into qa · 49f780ca
  rui.zhu committed Nov 30, 2023
  
  49f780ca Browse Files
- 随单买卡订单取消未退券 · 05359cb9
  rui.zhu committed Nov 30, 2023
  
  05359cb9 Browse Files
02 Nov, 2023 3 commits
- Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of… · 522c7256
```
Merge branch 'feature/20231102_订单宝录入会员信息订单送积分经验值_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 02, 2023
  522c7256 Browse Files
- redis序列号报错问题修改 · abe36a61
  ping.wu committed Nov 02, 2023
  
  abe36a61 Browse Files
- 升级分发器sdk，支持订单宝录入会员信息订单支持送积分经验值等 · 45b5ff3d
  ping.wu committed Nov 02, 2023
  
  45b5ff3d Browse Files
01 Nov, 2023 2 commits
- Merge branch 'feature/20231101_订单宝支付退款_wuping' of… · 7bca3aab
```
Merge branch 'feature/20231101_订单宝支付退款_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Nov 01, 2023
  7bca3aab 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 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