Commits · da25124d289b057a44c3d6ee9cd56b4efc4b4ad1 · order-group-application / order-group

10 Aug, 2023 1 commit
- 支付查询mq打印日志排查问题恢复 · da25124d
  ping.wu committed Aug 10, 2023
  
  da25124d Browse Files
03 Aug, 2023 1 commit

Merge branch 'feature/20230726_支付宝数据上报_wuping' of… · eb2f69c6

Merge branch 'feature/20230726_支付宝数据上报_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

committed Aug 03, 2023

eb2f69c6 Browse Files

31 Jul, 2023 1 commit
- 支付查询mq打印日志排查问题 · 2f38870a
  ping.wu committed Jul 31, 2023
  
  2f38870a Browse Files
27 Jul, 2023 1 commit
- 支付宝渠道订单订单状态变更都上报 · 411cd257
  ping.wu committed Jul 27, 2023
  
  411cd257 Browse Files
26 Jul, 2023 2 commits
- Merge branch 'feature/20230712_多种支付退款判断修改_wuping' of… · b8d671ed
```
Merge branch 'feature/20230712_多种支付退款判断修改_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
```
  ping.wu committed Jul 26, 2023
  b8d671ed Browse Files
- 其他支付（汇来米，收钱吧，现金，其他）调混合支付退款接口 · bed08e19
  ping.wu committed Jul 26, 2023
  
  bed08e19 Browse Files
25 Jul, 2023 2 commits
- 其他支付（汇来米，收钱吧，现金，其他）调混合支付退款接口 · fac03eae
  ping.wu committed Jul 25, 2023
  
  fac03eae Browse Files
- Merge branch 'feature/20230712_多种支付退款判断修改_wuping' of… · 70ff468b
```
Merge branch 'feature/20230712_多种支付退款判断修改_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jul 25, 2023
  70ff468b Browse Files
19 Jul, 2023 2 commits
- Merge branch 'feature/rui.zhu/关单逻辑优化' into qa · 4c289a58
  rui.zhu committed Jul 19, 2023
  
  4c289a58 Browse Files
- 支付回调超时已关单的订单直接退款处理 · 7a63c984
  rui.zhu committed Jul 19, 2023
  
  7a63c984 Browse Files
18 Jul, 2023 1 commit
- 支付回调超时已关单的订单直接退款处理 · 388238d3
  rui.zhu committed Jul 18, 2023
  
  388238d3 Browse Files
17 Jul, 2023 2 commits
- Merge branch 'feature/rui.zhu/关单逻辑优化' into qa · e97b047c
  rui.zhu committed Jul 17, 2023
  
  e97b047c Browse Files
- 不关心支付关单结果，不判断是否关闭预定单成功 · 1f00f3ad
  rui.zhu committed Jul 17, 2023
  
  1f00f3ad Browse Files
12 Jul, 2023 1 commit
- 订单支付明细有储值卡支付，调混合支付退款接口 · ddc879a1
  ping.wu committed Jul 12, 2023
  
  ddc879a1 Browse Files
14 Jun, 2023 2 commits
- Merge branch 'feature/zxh/创建订单传递storeUnifyId参数（门店ID）-20230612' into qa · 625c4b21
  周晓航 committed Jun 14, 2023
  
  625c4b21 Browse Files
- 创建订单传递storeUnifyId参数（门店ID） · 77511d23
  周晓航 committed Jun 14, 2023
  
  77511d23 Browse Files
16 May, 2023 2 commits
- Merge branch 'feature/三方外卖多次退款支持' into qa · ff9db1bd
  查志伟 committed May 16, 2023
  
  ff9db1bd Browse Files
- fix/三方外卖多次退款售后单号取值错误问题 · a19bf298
  查志伟 committed May 16, 2023
  
  a19bf298 Browse Files
17 Apr, 2023 1 commit
- Merge branch 'feature/订单宝快餐点餐支持取消订单' · 0790ad79
  查志伟 committed Apr 17, 2023
  
  0790ad79 Browse Files
11 Apr, 2023 1 commit
- Merge branch 'feature/订单宝快餐点餐支持取消订单' into qa · 6e8ce87b
  查志伟 committed Apr 11, 2023
  
  6e8ce87b Browse Files
10 Apr, 2023 3 commits
- Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of… · 353a691d
```
Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Apr 10, 2023
  353a691d Browse Files
- Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of… · 33ca3974
```
Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Apr 10, 2023
  33ca3974 Browse Files
- 支付宝外卖订单三方配送校验 · 2cab6da4
  ping.wu committed Apr 10, 2023
  
  2cab6da4 Browse Files
07 Apr, 2023 4 commits
- Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of… · 025ff020
```
Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Apr 07, 2023
  025ff020 Browse Files
- 取消订单前校验是否部分退 · 725609e4
  ping.wu committed Apr 07, 2023
  
  725609e4 Browse Files
- Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of… · 783db1e7
```
Merge branch 'feature/20230327_订单宝上同意退款记录操作渠道_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Apr 07, 2023
  783db1e7 Browse Files
- 取消订单前校验是否部分退 · fbbdfe5c
  ping.wu committed Apr 07, 2023
  
  fbbdfe5c Browse Files
04 Apr, 2023 3 commits
- Merge branch 'fix/门店自动退款不生效问题修复' into qa · c2918a87
  查志伟 committed Apr 04, 2023
  
  c2918a87 Browse Files
- fix/门店自动退款不生效问题修复 · 90ae4502
  查志伟 committed Apr 04, 2023
  
  90ae4502 Browse Files
- 支付补偿查询延时时间修改 · 94cc2d1b
  查志伟 committed Apr 04, 2023
  
  94cc2d1b Browse Files
03 Apr, 2023 1 commit
- 订单宝快餐点餐支持取消订单 · e5026d22
  查志伟 committed Apr 03, 2023
  
  e5026d22 Browse Files
28 Mar, 2023 1 commit
- 去除多余字段 · 348930a4
  ping.wu committed Mar 28, 2023
  
  348930a4 Browse Files
27 Mar, 2023 1 commit
- 订单宝上同意退款记录操作渠道 · 9f894f6d
  ping.wu committed Mar 27, 2023
  
  9f894f6d Browse Files
21 Mar, 2023 3 commits
- Merge branch 'feature/买券订单支持走非码付' into qa · 3dd6ceb8
  查志伟 committed Mar 21, 2023
  
  3dd6ceb8 Browse Files
- 买券支持非码付 · d5627814
  查志伟 committed Mar 21, 2023
  
  d5627814 Browse Files
- Merge branch 'feature/rui.zhu/pos点餐结算-20230308' · ef033a2d
  咸鱼 committed Mar 21, 2023
  
  ef033a2d Browse Files
20 Mar, 2023 1 commit
- 新版小程序商户禁用旧版下单接口 · 88d8bf55
  查志伟 committed Mar 20, 2023
  
  88d8bf55 Browse Files
16 Mar, 2023 1 commit
- Merge remote-tracking branch 'origin/feature/rui.zhu/pos点餐结算-20230308' into qa · d55059de
  查志伟 committed Mar 16, 2023
  
  d55059de Browse Files
14 Mar, 2023 1 commit
- 兼容线下支付订单拒单 · 0cb004c9
  咸鱼 committed Mar 14, 2023
  
  0cb004c9 Browse Files
06 Mar, 2023 1 commit
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' · 66188b47
  咸鱼 committed Mar 06, 2023
  
  66188b47 Browse Files