Commits · 33ca3974f9266683fa297d20ff039f4f122f1040 · order-group-application / order-group · GitLab

10 Apr, 2023 2 commits
- 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 2 commits
- Merge branch 'fix/门店自动退款不生效问题修复' into qa · c2918a87
  查志伟 committed Apr 04, 2023
  
  c2918a87 Browse Files
- fix/门店自动退款不生效问题修复 · 90ae4502
  查志伟 committed Apr 04, 2023
  
  90ae4502 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
28 Feb, 2023 6 commits
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · 257b09c4
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Feb 28, 2023
  257b09c4 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 21240a37
  ping.wu committed Feb 28, 2023
  
  21240a37 Browse Files
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · dc8ea0f9
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Feb 28, 2023
  dc8ea0f9 Browse Files
- 拒单设置退款退配送费 · 4a52c6d3
  ping.wu committed Feb 28, 2023
  
  4a52c6d3 Browse Files
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' into qa · 0e3324aa
  咸鱼 committed Feb 28, 2023
  
  0e3324aa Browse Files
- 修复订单状态公共处理中心发送判断条件 · 235e6cb9
  咸鱼 committed Feb 28, 2023
  
  235e6cb9 Browse Files
23 Feb, 2023 2 commits
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' into qa · 8e937bab
  咸鱼 committed Feb 23, 2023
  
  8e937bab Browse Files
- 调整订单评价错误返回格式 · 8d6d528c
  咸鱼 committed Feb 23, 2023
  
  8d6d528c Browse Files
22 Feb, 2023 1 commit
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' into qa · df2a976e
  咸鱼 committed Feb 22, 2023
  
  df2a976e Browse Files
17 Feb, 2023 1 commit
- Merge branch 'bugfix/接单超时时间修复' into qa · dda728af
  查志伟 committed Feb 17, 2023
  
  dda728af Browse Files
14 Feb, 2023 1 commit
- 移除订单订阅消息发送，改由task-order-center统一处理 · c164735f
  咸鱼 committed Feb 14, 2023
  
  c164735f Browse Files
13 Feb, 2023 1 commit
- 独立生成取餐码接口 · be1a1d10
  查志伟 committed Feb 13, 2023
  
  be1a1d10 Browse Files
10 Feb, 2023 3 commits
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · f3eb671c
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Feb 10, 2023
  f3eb671c Browse Files
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · f6b8d339
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Feb 10, 2023
  f6b8d339 Browse Files
- 自动制作完成超时时间未设置修复 · 7762ee8d
  ping.wu committed Feb 10, 2023
  
  7762ee8d Browse Files
07 Feb, 2023 2 commits
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · b55898e8
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Feb 07, 2023
  b55898e8 Browse Files
- Merge branch 'feature/退款支持优化' into 'master' · 4a2fb5bc
```
Feature/退款支持优化

See merge request !147
```
  胡博文 committed Feb 07, 2023
  4a2fb5bc Browse Files
06 Feb, 2023 2 commits
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · e1ddd318
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Feb 06, 2023
  e1ddd318 Browse Files
- 部分退，退款完成可继续扭转订单状态 · 88b1b7a4
  ping.wu committed Feb 06, 2023
  
  88b1b7a4 Browse Files
03 Feb, 2023 4 commits
- Merge branch 'feature/退款支持优化' into qa · 4fa4cb4a
  咸鱼 committed Feb 03, 2023
  
  4fa4cb4a Browse Files
- 调整文件位置 · 0b05cac2
  咸鱼 committed Feb 03, 2023
  
  0b05cac2 Browse Files
- Merge branch 'feature/退款支持优化' into qa · 0d32b6fb
  咸鱼 committed Feb 03, 2023
  
  0d32b6fb Browse Files
- 删除两个多余文件 · 5e2873b2
  咸鱼 committed Feb 03, 2023
  
  5e2873b2 Browse Files