Commits · 5df0690dc3eb4b35600c999fcb6b10970ab945c6 · order-group-application / order-group

30 Dec, 2021 2 commits
- 商家自配送不走手动\半自动派单 · 5df0690d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 30, 2021
  5df0690d Browse Files
- 对接api修改 · 414e714f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 30, 2021
  414e714f Browse Files
28 Dec, 2021 2 commits
- 修复生产NPE · a29ac354
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 28, 2021
  a29ac354 Browse Files
- 优化购物车调用促销的提示 · 4482097b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 28, 2021
  4482097b Browse Files
27 Dec, 2021 2 commits
- 预定单预约单不走手动派单&半自动派单逻辑 · adcbc575
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 27, 2021
  adcbc575 Browse Files
- 修改基础服务需要的参数名 · 54fe956a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 27, 2021
  54fe956a Browse Files
24 Dec, 2021 2 commits

完成调用基础服务带入参数 · 7f857434
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Dec 24, 2021
7f857434 Browse Files

1.优先匹配是否活动日
2.工作日/双休日二选一,不会出现没有的情况(产品明确)

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

committed Dec 24, 2021

11887bfc Browse Files

22 Dec, 2021 1 commit
- 优化代码传参 · d011e052
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 22, 2021
  d011e052 Browse Files
21 Dec, 2021 2 commits

新增注释,无代码改动 · 836a0f88
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
周晓航 committed Dec 21, 2021
836a0f88 Browse Files

Merge branch 'feature_夜间配送ID1040499_zxh20211208' · 0c207dca

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/delivery/impl/GradDeliveryServiceImpl.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

committed Dec 21, 2021

0c207dca Browse Files

17 Dec, 2021 3 commits
- Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'master' of… · 8866fd31
```
Merge branches 'feature/20211213_保存spu商品货号_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Dec 17, 2021
  8866fd31 Browse Files
- 删除日志 · 73d78e90
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 17, 2021
  73d78e90 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/20211124-v3算价优化改造' · ea571c7e
  胡敬轩 committed Dec 17, 2021
  
  ea571c7e Browse Files
16 Dec, 2021 9 commits
- Merge branch 'feature/xukang_20211201_虚拟订单退款' · c8ca553e
  徐康 committed Dec 16, 2021
  
  c8ca553e Browse Files
- 夜间配送费字段新增 · 1e1d923e
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  1e1d923e Browse Files
- 夜间配送费字段新增 · 522d5294
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  522d5294 Browse Files
- 夜间配送费字段新增 · 82bb4442
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  82bb4442 Browse Files
- 夜间配送费字段新增 · 2b995ad8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  2b995ad8 Browse Files
- 添加日志 · 90a927d5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  90a927d5 Browse Files
- 新算价支持夜间配送费计算 · b2e5f2c9
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  b2e5f2c9 Browse Files
- 解决NPE · f23bb513
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 16, 2021
  f23bb513 Browse Files
- 虚拟商品货号保存extinfo · 896ee7cd
  ping.wu committed Dec 16, 2021
  
  896ee7cd Browse Files
15 Dec, 2021 8 commits
- 配送范围判断fix · 0c84b2f7
  查志伟 committed Dec 15, 2021
  
  0c84b2f7 Browse Files
- 问题修复 · 95450764
  徐康 committed Dec 15, 2021
  
  95450764 Browse Files
- 问题修复 · f1bff084
  徐康 committed Dec 15, 2021
  
  f1bff084 Browse Files
- 维护购物车配送费需求 · 86790ff5
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 15, 2021
  86790ff5 Browse Files
- 问题修复 · 39eb3361
  徐康 committed Dec 15, 2021
  
  39eb3361 Browse Files
- 问题修复 · 0022efe9
  徐康 committed Dec 15, 2021
  
  0022efe9 Browse Files
- 维护购物车配送费需求 · 748c67d6
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 15, 2021
  748c67d6 Browse Files
- 维护购物车配送费需求 · c8544658
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 15, 2021
  c8544658 Browse Files
14 Dec, 2021 9 commits
- Merge branch 'hotfix_混合支付异常' · 8bd8fed8
  徐光兴 committed Dec 14, 2021
  
  8bd8fed8 Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into… · 1fc1dcdb
```
Merge remote-tracking branch 'origin/feature/xukang_20211201_虚拟订单退款' into feature/xukang_20211201_虚拟订单退款
```
  徐康 committed Dec 14, 2021
  1fc1dcdb Browse Files
- 问题修复 · c455f919
  徐康 committed Dec 14, 2021
  
  c455f919 Browse Files
- 退款异常不发mq · 5b3be441
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 14, 2021
  5b3be441 Browse Files
- fix:线上商品数量超过促销限制,会报错导致情况购物车, · 37f306ce
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 14, 2021
  37f306ce Browse Files
- 问题修复 · 34c7bad6
  徐康 committed Dec 14, 2021
  
  34c7bad6 Browse Files
- 问题修复 · 61f09bfc
  徐康 committed Dec 14, 2021
  
  61f09bfc Browse Files
- 问题修复 · 46b82af3
  徐康 committed Dec 14, 2021
  
  46b82af3 Browse Files
- 修复获取夜间配送费字段错误 · 1f9d6ec2
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Dec 14, 2021
  1f9d6ec2 Browse Files