Commits · 2b94ebdebb349fde138f90888013a04aa964d81b · order-group-application / order-group · GitLab

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
05 Jan, 2023 3 commits
- 抖音退款商品id传参修复 · 62ca6839
  查志伟 committed Jan 05, 2023
  
  62ca6839 Browse Files
- fix退款售后单传参错误 · 27ed02bf
  查志伟 committed Jan 05, 2023
  
  27ed02bf Browse Files
- 抖音退款增加拓展参数赋值 · 9da7ecdc
  查志伟 committed Jan 05, 2023
  
  9da7ecdc Browse Files
16 Dec, 2022 6 commits
- Merge branch 'feature/退款支持优化' into develop · ae4e50c3
  查志伟 committed Dec 16, 2022
  
  ae4e50c3 Browse Files
- C端退款增加配置校验 · 1bea5f4a
  查志伟 committed Dec 16, 2022
  
  1bea5f4a Browse Files
- C端退款增加配置校验 · 47df9630
  查志伟 committed Dec 16, 2022
  
  47df9630 Browse Files
- Merge branch 'feature/退款支持优化' into develop · 75cb8aeb
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  查志伟 committed Dec 16, 2022
  75cb8aeb Browse Files
- 提供退订单金额接口 · f1fef8a7
  查志伟 committed Dec 16, 2022
  
  f1fef8a7 Browse Files
- 退款接口代码优化 · 6bda8ab9
  查志伟 committed Dec 16, 2022
  
  6bda8ab9 Browse Files
14 Dec, 2022 1 commit
- 去掉废弃代码 · 8eba73db
  查志伟 committed Dec 14, 2022
  
  8eba73db Browse Files
13 Dec, 2022 4 commits
- Merge branch 'bugfix-取消订单orderclient传递错误' into develop · 09574429
  周晓航 committed Dec 13, 2022
  
  09574429 Browse Files
- bugfix: 修复订单退款 orderclient写死了的问题 · 3d93c743
  周晓航 committed Dec 13, 2022
  
  3d93c743 Browse Files
- Merge branch 'bugfix-取消订单orderclient传递错误' into develop · 944d203a
  周晓航 committed Dec 13, 2022
  
  944d203a Browse Files
- bugfix: 修复订单退款 orderclient写死了的问题 · 145003f6
  周晓航 committed Dec 13, 2022
  
  145003f6 Browse Files
06 Dec, 2022 4 commits
- Merge branch 'master' of… · 0312295e
```
Merge branch 'master' of https://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Dec 06, 2022
  0312295e Browse Files
- Merge branch 'feature/20221125_收货人名称保存_wuping' of… · 297f272b
```
Merge branch 'feature/20221125_收货人名称保存_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 06, 2022
  297f272b Browse Files
- 创建配送单收货人判断修改 · f16569f4
  ping.wu committed Dec 06, 2022
  
  f16569f4 Browse Files
- Merge branch 'feature/20221125_收货人名称保存_wuping' of… · cb8a2288
```
Merge branch 'feature/20221125_收货人名称保存_wuping' of https://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 06, 2022
  cb8a2288 Browse Files