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

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 15 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
- Merge branch 'feature/退款支持优化' into develop · 39741f4d
  咸鱼 committed Jan 09, 2023
  
  39741f4d Browse Files
- 还原部分退功能走老接口 · 6ef434ed
  咸鱼 committed Jan 09, 2023
  
  6ef434ed Browse Files
- Merge branch 'feature/退款支持优化' into develop · d5f06548
  咸鱼 committed Jan 09, 2023
  
  d5f06548 Browse Files
- fix npe exception · c9a3c653
  咸鱼 committed Jan 09, 2023
  
  c9a3c653 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 9df9be7d
  咸鱼 committed Jan 09, 2023
  
  9df9be7d Browse Files
- fix:修复未接单状态的退款提示门店不支持退款 · 84bfc460
  咸鱼 committed Jan 09, 2023
  
  84bfc460 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 93372cbd
  咸鱼 committed Jan 09, 2023
  
  93372cbd Browse Files
- Merge remote-tracking branch 'origin/feature/退款支持优化' into feature/退款支持优化 · 37799091
  咸鱼 committed Jan 09, 2023
  
  37799091 Browse Files
- feat:订单支持部分退款 · d2f97121
  咸鱼 committed Jan 09, 2023
  
  d2f97121 Browse Files
06 Jan, 2023 1 commit
- Merge branch 'feature/退款支持优化' into develop · 1bd57386
  查志伟 committed Jan 06, 2023
  
  1bd57386 Browse Files