Commits · cdfec6e076d7f5193fc22a63192320de876aa82f · order-group-application / order-group · GitLab

11 Dec, 2023 2 commits
- 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 7 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 remote-tracking branch 'origin/develop' into develop · 9af7a12e
  ping.wu committed Aug 18, 2023
  
  9af7a12e Browse Files
- Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · 793ba848
```
Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 18, 2023
  793ba848 Browse Files
- 支付上报新增orderClient · d08dd5fa
  ping.wu committed Aug 18, 2023
  
  d08dd5fa Browse Files
17 Aug, 2023 8 commits
- Merge branch 'feature/售后单记录支付信息' into develop · fcb7596e
  rui.zhu committed Aug 17, 2023
  
  fcb7596e 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… · 366d40f0
```
Merge branch 'feature/售后单记录支付信息' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 17, 2023
  366d40f0 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 develop · c39b6901
  rui.zhu committed Aug 17, 2023
  
  c39b6901 Browse Files