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

20 Dec, 2021 2 commits
- Merge branch 'feature-维护POS商品编码ID1039549-zxh-20211123' into qa · be50ce85
  周晓航 committed Dec 20, 2021
  
  be50ce85 Browse Files
- 多规格商品添加自规格商品的pos编码 · 55885b10
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 20, 2021
  55885b10 Browse Files
16 Dec, 2021 23 commits
- Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of… · a8940dae
```
Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
```
  ping.wu committed Dec 16, 2021
  a8940dae Browse Files
- 报错修改 · 87bd62db
  ping.wu committed Dec 16, 2021
  
  87bd62db Browse Files
- 商城，拼团OrderType改默认值1 · 5497d84d
  ping.wu committed Dec 16, 2021
  
  5497d84d Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · e8ca045a
  周晓航 committed Dec 16, 2021
  
  e8ca045a Browse Files
- 夜间配送费字段新增 · 1e1d923e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  1e1d923e Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · d306e822
  周晓航 committed Dec 16, 2021
  
  d306e822 Browse Files
- 夜间配送费字段新增 · 522d5294
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  522d5294 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · 35d4b513
  周晓航 committed Dec 16, 2021
  
  35d4b513 Browse Files
- 夜间配送费字段新增 · 82bb4442
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  82bb4442 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · 9b5f90ba
  周晓航 committed Dec 16, 2021
  
  9b5f90ba Browse Files
- 夜间配送费字段新增 · 2b995ad8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  2b995ad8 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · 98f71c86
  周晓航 committed Dec 16, 2021
  
  98f71c86 Browse Files
- 添加日志 · 90a927d5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  90a927d5 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · f3e0c6fb
  周晓航 committed Dec 16, 2021
  
  f3e0c6fb Browse Files
- 新算价支持夜间配送费计算 · b2e5f2c9
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  b2e5f2c9 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · efd11db8
  周晓航 committed Dec 16, 2021
  
  efd11db8 Browse Files
- 解决NPE · f23bb513
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  f23bb513 Browse Files
- Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of… · 1b922021
```
Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  蒋小洋 committed Dec 16, 2021
  1b922021 Browse Files
- 配送服务 · 8deed040
  蒋小洋 committed Dec 16, 2021
  
  8deed040 Browse Files
- Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'qa' of… · 0a929609
```
Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Dec 16, 2021
  0a929609 Browse Files
- 虚拟商品货号保存extinfo · 896ee7cd
  ping.wu committed Dec 16, 2021
  
  896ee7cd Browse Files
- Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of… · 550a432b
```
Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  蒋小洋 committed Dec 16, 2021
  550a432b Browse Files
- 配送服务 · 96051f7d
  蒋小洋 committed Dec 16, 2021
  
  96051f7d Browse Files
15 Dec, 2021 15 commits
- Merge branch 'feature/xukang_20211201_虚拟订单退款' into qa · 3ecc14db
  周晓航 committed Dec 15, 2021
  
  3ecc14db Browse Files
- 维护购物车配送费需求 · 97b1c23c
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 15, 2021
  97b1c23c Browse Files
- Merge branch 'feature/xukang_20211201_虚拟订单退款' into qa · d4aae176
  徐康 committed Dec 15, 2021
  
  d4aae176 Browse Files
- 问题修复 · 95450764
  徐康 committed Dec 15, 2021
  
  95450764 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 35b8ee8b
  徐康 committed Dec 15, 2021
  
  35b8ee8b Browse Files
- Merge branch 'feature/xukang_20211201_虚拟订单退款' into qa · 768f39b3
  徐康 committed Dec 15, 2021
  
  768f39b3 Browse Files
- 问题修复 · f1bff084
  徐康 committed Dec 15, 2021
  
  f1bff084 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · 1f2e4f5f
  周晓航 committed Dec 15, 2021
  
  1f2e4f5f Browse Files
- 维护购物车配送费需求 · 86790ff5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 15, 2021
  86790ff5 Browse Files
- Merge branch 'feature/xukang_20211201_虚拟订单退款' into qa · 1e4db1cd
  徐康 committed Dec 15, 2021
  
  1e4db1cd Browse Files
- Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of… · 5b6bc62a
```
Merge branches 'ka-野翠山结算和支付配送校验-20211210-jxy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

 Conflicts:
	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
	order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java
	shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerClient.java
```
  蒋小洋 committed Dec 15, 2021
  5b6bc62a Browse Files
- 问题修复 · 39eb3361
  徐康 committed Dec 15, 2021
  
  39eb3361 Browse Files
- Merge branch 'feature_夜间配送ID1040499_zxh20211208' into qa · d8a64191
  周晓航 committed Dec 15, 2021
  
  d8a64191 Browse Files
- Merge branch 'feature/xukang_20211201_虚拟订单退款' into qa · 5f3d655b
  徐康 committed Dec 15, 2021
  
  5f3d655b Browse Files
- 问题修复 · 0022efe9
  徐康 committed Dec 15, 2021
  
  0022efe9 Browse Files