Commits · 88442623928a16a81ab6be30581a62e8fadb6cf5 · order-group-application / order-group

27 Dec, 2021 1 commit
- 抖音小程序查询卖券订单处理，美业代码去除 · 88442623
  ping.wu committed Dec 27, 2021
  
  88442623 Browse Files
25 Dec, 2021 1 commit
- feign合并 · 86605b2c
  ping.wu committed Dec 25, 2021
  
  86605b2c Browse Files
24 Dec, 2021 3 commits

Merge branches 'feature/20211209_订单业务类型改造_wuping' and… · ec8e9e2a

Merge branches 'feature/20211209_订单业务类型改造_wuping' and 'feature/20211224_订单业务类型改造合并分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20211224_订单业务类型改造合并分支_wuping

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
#	order-application-service/src/main/java/cn/freemud/enums/OrderType.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/CustomerExtendClient.java

committed Dec 24, 2021

ec8e9e2a Browse Files

微商城渠道实现判断修改 · 35b17623
ping.wu committed Dec 24, 2021

35b17623 Browse Files
微商城同意退款判断修改，订单渠道，订单状态，OrderMarketType枚举合并 · 7248a4a4
ping.wu committed Dec 24, 2021

7248a4a4 Browse Files

23 Dec, 2021 3 commits
- 微商城订单类型从外卖变到店订单状态描述同步修改 · f9564940
  ping.wu committed Dec 23, 2021
  
  f9564940 Browse Files
- Revert "code_v4接口查询速度优化" · bf344b6b
```
This reverts commit 269d1808
```
  查志伟 committed Dec 23, 2021
  bf344b6b Browse Files
- code_v4接口查询速度优化 · 269d1808
  查志伟 committed Dec 23, 2021
  
  269d1808 Browse Files
22 Dec, 2021 3 commits
- 微商城兼容,点餐到店不查无单收银 · d6e73f92
  ping.wu committed Dec 22, 2021
  
  d6e73f92 Browse Files
- 重复赋值错误修改，微商城和拼团查询订单列表修改 · 65a50abf
  ping.wu committed Dec 22, 2021
  
  65a50abf Browse Files
- 预定业务走默认点餐，算价接口字段设置默认值"isaas" · aa6943a4
  ping.wu committed Dec 22, 2021
  
  aa6943a4 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 11 commits
- 报错修改 · 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/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 5 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