Commits · 13a08f40697db73035293e2ac41c88ea3ccae47d · order-group-application / order-group · GitLab

30 Nov, 2021 4 commits
- 开票人余培栩 · 13a08f40
  蒋小洋 committed Nov 30, 2021
  
  13a08f40 Browse Files
- Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of… · bf9bce8c
```
Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 30, 2021
  bf9bce8c Browse Files
- Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'master' of… · 971e2a1f
```
Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
```
  ping.wu committed Nov 30, 2021
  971e2a1f Browse Files
- Merge remote-tracking branch 'origin/master' · 1183673c
  查志伟 committed Nov 30, 2021
  
  1183673c Browse Files
29 Nov, 2021 5 commits
- 卖券订单金额为0走老逻辑 · cf985616
  ping.wu committed Nov 29, 2021
  
  cf985616 Browse Files
- Merge branch 'feature-商品限购活动限购次数记录，扣减，冲正-1039517-zxh20211118' · 84554661
  周晓航 committed Nov 29, 2021
  
  84554661 Browse Files
- 购物车新算价赠品显示bug修复 · 8d9cac8b
  查志伟 committed Nov 29, 2021
  
  8d9cac8b Browse Files
- 蜜雪冰城定制代码删除 · 92df5c45
  ping.wu committed Nov 29, 2021
  
  92df5c45 Browse Files
- 购物车新算价赠品显示bug修复 · 248b3b66
  查志伟 committed Nov 29, 2021
  
  248b3b66 Browse Files
26 Nov, 2021 1 commit
- 门店赋值，查询自动扭转时间配置 · 872f0df0
  ping.wu committed Nov 26, 2021
  
  872f0df0 Browse Files
25 Nov, 2021 7 commits
- 使用订单枚举OrderStatusV1装换订单状态 · 8078e4d8
  ping.wu committed Nov 25, 2021
  
  8078e4d8 Browse Files
- convent2NEWOrderInfo转化转移，orderBean对象type字段合并成orderType · e809cb5a
  ping.wu committed Nov 25, 2021
  
  e809cb5a Browse Files
- Merge remote-tracking branch 'origin/master' · 8ae6c36f
  周晓航 committed Nov 25, 2021
  
  8ae6c36f Browse Files
- 修改查询出异常的信息抛出日志格式 · 01cbfa59
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 25, 2021
  01cbfa59 Browse Files
- 判断修改 · 28851079
  ping.wu committed Nov 25, 2021
  
  28851079 Browse Files
- Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of… · f192d2f4
```
Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 25, 2021
  f192d2f4 Browse Files
- 卖券订单支付渠道记录 · b7d1abb2
  ping.wu committed Nov 25, 2021
  
  b7d1abb2 Browse Files
24 Nov, 2021 12 commits
- 商品限购虚拟券服务端拦截校验 · 2a89b036
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  2a89b036 Browse Files
- 合并master代码 · 0341cd60
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  0341cd60 Browse Files
- Merge branch 'master' into feature-商品限购活动限购次数记录，扣减，冲正-1039517-zxh20211118 · 83161700
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
```
  周晓航 committed Nov 24, 2021
  83161700 Browse Files
- 卖券订单调用促销扣减库存逻辑修改 · 2fe9f749
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  2fe9f749 Browse Files
- 卖券订单调用促销新增活动类型 · 6f7eda05
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  6f7eda05 Browse Files
- 卖券订单调用促销新增活动类型 · 6944771b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  6944771b Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' · b5217d6e
  周晓航 committed Nov 24, 2021
  
  b5217d6e Browse Files
- 增加卖券的时间校验 · ec6d517a
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  ec6d517a Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' · 732ffd6c
  周晓航 committed Nov 24, 2021
  
  732ffd6c Browse Files
- 增加卖券的时间校验 · a33f0d46
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  a33f0d46 Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' · d5dee9dc
  周晓航 committed Nov 24, 2021
  
  d5dee9dc Browse Files
- 修改时间校验 · 48cc17c1
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 24, 2021
  48cc17c1 Browse Files
23 Nov, 2021 9 commits
- Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of… · 72ceb496
```
Merge branches 'feature/20211122_查询门店配送接口合并_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group into feature/20211122_查询门店配送接口合并_wuping
```
  ping.wu committed Nov 23, 2021
  72ceb496 Browse Files
- Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of… · e8d2214d
```
Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 23, 2021
  e8d2214d Browse Files
- 预支付接口失败判断修改 · f93d018b
  ping.wu committed Nov 23, 2021
  
  f93d018b Browse Files
- Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of… · 24c88525
```
Merge branches 'feature/20211123_预支付接口空指针修复_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Nov 23, 2021
  24c88525 Browse Files
- 调用预支付接口 · f2cf1c54
  ping.wu committed Nov 23, 2021
  
  f2cf1c54 Browse Files
- 设置虚拟商品库里存的商品类型 · b66812eb
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Nov 23, 2021
  b66812eb Browse Files
- Merge branch 'feature-zxh-20211109-替换券码查询接口-1039131' · d6330d2a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  周晓航 committed Nov 23, 2021
  d6330d2a Browse Files
- 合并代码 · dbf8f211
  ping.wu committed Nov 23, 2021
  
  dbf8f211 Browse Files
- 门店配送信息接口合并到门店综合查询接口 · 7c620afc
  ping.wu committed Nov 23, 2021
  
  7c620afc Browse Files
22 Nov, 2021 2 commits
- 门店配送信息接口合并到门店综合查询接口 · a6f626d8
  ping.wu committed Nov 22, 2021
  
  a6f626d8 Browse Files
- 查询门店配送信息新增参数 · 8f180ef7
  ping.wu committed Nov 22, 2021
  
  8f180ef7 Browse Files