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

23 Jun, 2021 28 commits
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · f612ad87
  徐康 committed Jun 23, 2021
  
  f612ad87 Browse Files
- 问题修复 · af1f0f08
  徐康 committed Jun 23, 2021
  
  af1f0f08 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 85fbf0d1
  徐康 committed Jun 23, 2021
  
  85fbf0d1 Browse Files
- 问题修复 · 3f4faace
  徐康 committed Jun 23, 2021
  
  3f4faace Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 16abb6a5
  徐康 committed Jun 23, 2021
  
  16abb6a5 Browse Files
- 问题修复 · 6d1b6c8e
  徐康 committed Jun 23, 2021
  
  6d1b6c8e Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 6c016d19
```
 Conflicts:
	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  周晓航 committed Jun 23, 2021
  6c016d19 Browse Files
- 合并代码报错修改 · 651b15ee
  ping.wu committed Jun 23, 2021
  
  651b15ee Browse Files
- Merge branches 'feature/20210615_PrometheusSchedulerCustom_lb' and 'qa' of… · e76c561a
```
Merge branches 'feature/20210615_PrometheusSchedulerCustom_lb' 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/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  ping.wu committed Jun 23, 2021
  e76c561a Browse Files
- Merge branch 'KA-券核销-传券优惠金额-周晓航' into qa · faf0e749
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
```
  周晓航 committed Jun 23, 2021
  faf0e749 Browse Files
- 【ID1032412】【订单聚合层】核销传入优惠金额之传劵优惠 · 76b44763
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  76b44763 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 257bdda7
  徐康 committed Jun 23, 2021
  
  257bdda7 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 29f4af42
  徐康 committed Jun 23, 2021
  
  29f4af42 Browse Files
- 买3赠1券 · bd5ee096
  徐康 committed Jun 23, 2021
  
  bd5ee096 Browse Files
- Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa · e0deb94d
  周晓航 committed Jun 23, 2021
  
  e0deb94d Browse Files
- 修复外卖送达时间计算错误bug · b0801b22
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  b0801b22 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · de1acced
  徐康 committed Jun 23, 2021
  
  de1acced Browse Files
- 买3赠1券 · de205a07
  徐康 committed Jun 23, 2021
  
  de205a07 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · cb99751f
  徐康 committed Jun 23, 2021
  
  cb99751f Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 888b1717
  徐康 committed Jun 23, 2021
  
  888b1717 Browse Files
- 买3赠1tenderId · ce4d3377
  徐康 committed Jun 23, 2021
  
  ce4d3377 Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · a60f2191
  周晓航 committed Jun 23, 2021
  
  a60f2191 Browse Files
- 调用可选优惠券计算配送券是否可用 · 5fa06c84
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  5fa06c84 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 857e3cdb
  徐康 committed Jun 23, 2021
  
  857e3cdb Browse Files
- 问题修复 · a61efbd7
  徐康 committed Jun 23, 2021
  
  a61efbd7 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · b69f8b64
  徐康 committed Jun 23, 2021
  
  b69f8b64 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 78262762
  徐康 committed Jun 23, 2021
  
  78262762 Browse Files
- 过滤问题 · 7e48c987
  徐康 committed Jun 23, 2021
  
  7e48c987 Browse Files
22 Jun, 2021 12 commits
- Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'master' of… · 3f276d2f
```
Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed Jun 22, 2021
  3f276d2f Browse Files
- Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'qa' of… · b8f178b6
```
Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 22, 2021
  b8f178b6 Browse Files
- 时间转换报错，去掉时间 · f059918b
  ping.wu committed Jun 22, 2021
  
  f059918b Browse Files
- redis 依赖报错 · 1d0fb6f8
  ping.wu committed Jun 22, 2021
  
  1d0fb6f8 Browse Files
- Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'qa' of… · a518333b
```
Merge branches 'featur/20210609-订单调getMemberExtendInfo接口优化-zy' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Jun 22, 2021
  a518333b Browse Files
- json装换报错，时间接收修改 · 865a2bbd
  ping.wu committed Jun 22, 2021
  
  865a2bbd Browse Files
- Merge branches 'featur/20210527-配送服务异常回调' and 'master' of… · acc35a8b
```
Merge branches 'featur/20210527-配送服务异常回调' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed Jun 22, 2021
  acc35a8b Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 64ff6af5
  徐康 committed Jun 22, 2021
  
  64ff6af5 Browse Files
- 移除9998商品 · ff379a03
  徐康 committed Jun 22, 2021
  
  ff379a03 Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' into qa · 177baf54
  周晓航 committed Jun 22, 2021
  
  177baf54 Browse Files
- 评论有礼 · b30b334d
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 22, 2021
  b30b334d Browse Files
- Merge branch 'KA-20210617评价有礼ID1031153-周晓航' into qa · f30dca61
  周晓航 committed Jun 22, 2021
  
  f30dca61 Browse Files