Commits · 958a807c1748bc5deea55ab8c93292f1ac789f52 · order-group-application / order-group · GitLab

14 Mar, 2023 2 commits
- Merge branch 'feature/rui.zhu/pos点餐结算-20230308' into develop · 958a807c
  咸鱼 committed Mar 14, 2023
  
  958a807c Browse Files
- 兼容线下支付订单拒单 · 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 3 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
- 拒单设置退款退配送费 · 4a52c6d3
  ping.wu committed Feb 28, 2023
  
  4a52c6d3 Browse Files
- 修复订单状态公共处理中心发送判断条件 · 235e6cb9
  咸鱼 committed Feb 28, 2023
  
  235e6cb9 Browse Files
23 Feb, 2023 2 commits
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' into develop · 464f10e0
  咸鱼 committed Feb 23, 2023
  
  464f10e0 Browse Files
- 调整订单评价错误返回格式 · 8d6d528c
  咸鱼 committed Feb 23, 2023
  
  8d6d528c Browse Files
14 Feb, 2023 2 commits
- Merge branch 'feature/rui.zhu/2023-02-13/订阅消息优化' into develop · 6a80840c
  咸鱼 committed Feb 14, 2023
  
  6a80840c Browse Files
- 移除订单订阅消息发送，改由task-order-center统一处理 · c164735f
  咸鱼 committed Feb 14, 2023
  
  c164735f Browse Files
13 Feb, 2023 2 commits
- Merge branch 'bugfix/接单超时时间修复' into develop · b5f43866
  查志伟 committed Feb 13, 2023
  
  b5f43866 Browse Files
- 独立生成取餐码接口 · be1a1d10
  查志伟 committed Feb 13, 2023
  
  be1a1d10 Browse Files
10 Feb, 2023 4 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 remote-tracking branch 'origin/develop' into develop · 4bbef2d1
  ping.wu committed Feb 10, 2023
  
  4bbef2d1 Browse Files
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · cd694771
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Feb 10, 2023
  cd694771 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 1 commit
- 部分退，退款完成可继续扭转订单状态 · 88b1b7a4
  ping.wu committed Feb 06, 2023
  
  88b1b7a4 Browse Files
03 Feb, 2023 5 commits
- Merge branch 'feature/退款支持优化' into develop · 1c44a280
  咸鱼 committed Feb 03, 2023
  
  1c44a280 Browse Files
- 调整文件位置 · 0b05cac2
  咸鱼 committed Feb 03, 2023
  
  0b05cac2 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 446914dc
  咸鱼 committed Feb 03, 2023
  
  446914dc Browse Files
- 删除两个多余文件 · 5e2873b2
  咸鱼 committed Feb 03, 2023
  
  5e2873b2 Browse Files
- 部分退款不进行积分和库存冲正 · 68bef243
  咸鱼 committed Feb 03, 2023
  
  68bef243 Browse Files
01 Feb, 2023 4 commits
- Merge branch 'feature/退款支持优化' into develop · 92c12731
  咸鱼 committed Feb 01, 2023
  
  92c12731 Browse Files
- 修复NumberFormatException，混合支付退款金额去settlementAmount · d0a8b244
  咸鱼 committed Feb 01, 2023
  
  d0a8b244 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 1c6c7fcc
  咸鱼 committed Feb 01, 2023
  
  1c6c7fcc Browse Files
- debug · b3b0fa53
  咸鱼 committed Feb 01, 2023
  
  b3b0fa53 Browse Files
31 Jan, 2023 2 commits
- Merge branch 'feature/退款支持优化' into develop · 2b94ebde
  朱瑞 committed Jan 31, 2023
  
  2b94ebde Browse Files
- fix:布尔类型is开头赋值问题 · ddf5b1e7
  朱瑞 committed Jan 31, 2023
  
  ddf5b1e7 Browse Files
18 Jan, 2023 4 commits
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · 4ef04abd
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jan 18, 2023
  4ef04abd Browse Files
- 自动接单标识 · f2333a34
  ping.wu committed Jan 18, 2023
  
  f2333a34 Browse Files
- Merge branch 'feature/20230118_服务端自动接单标识_wuping' of… · 48db163e
```
Merge branch 'feature/20230118_服务端自动接单标识_wuping' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Jan 18, 2023
  48db163e Browse Files
- 自动接单标识 · ad93eafb
  ping.wu committed Jan 18, 2023
  
  ad93eafb Browse Files
09 Jan, 2023 6 commits
- Merge branch 'feature/退款支持优化' into develop · 4aa75580
  查志伟 committed Jan 10, 2023
  
  4aa75580 Browse Files
- 修复退款校验判断问题 · bf6176da
  查志伟 committed Jan 10, 2023
  
  bf6176da Browse Files
- Merge branch 'feature/退款支持优化' into develop · 3ad74b8c
  咸鱼 committed Jan 09, 2023
  
  3ad74b8c Browse Files
- fix:部分退款金额未set · a4562544
  咸鱼 committed Jan 09, 2023
  
  a4562544 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 28028c2d
  FM00879 committed Jan 09, 2023
  
  28028c2d Browse Files
- 退款时没有找到fmId，则从ext中获取 · a7584850
  FM00879 committed Jan 09, 2023
  
  a7584850 Browse Files