Commits · 3e6cb5159ef62273da957b50c7ddce9155553c10 · order-group-application / order-group · GitLab

24 Jun, 2021 7 commits
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 3e6cb515
  徐康 committed Jun 24, 2021
  
  3e6cb515 Browse Files
- 修复问题 · 08c6c36e
  徐康 committed Jun 24, 2021
  
  08c6c36e Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 2a9c3791
  徐康 committed Jun 24, 2021
  
  2a9c3791 Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into… · f5dff933
```
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
```
  徐康 committed Jun 24, 2021
  f5dff933 Browse Files
- 修复问题 · 5d77c46b
  徐康 committed Jun 24, 2021
  
  5d77c46b Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · ea913769
  周晓航 committed Jun 24, 2021
  
  ea913769 Browse Files
- 新算价优惠总金额需要加上配送券的优惠金额 · a502a24f
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 24, 2021
  a502a24f Browse Files
23 Jun, 2021 33 commits
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · 3d98db69
  周晓航 committed Jun 23, 2021
  
  3d98db69 Browse Files
- 新算价计算使用优惠券金额 · f43fbba8
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  f43fbba8 Browse Files
- Merge branch 'KA-券核销-传券优惠金额-周晓航' into qa · fc96f612
  周晓航 committed Jun 23, 2021
  
  fc96f612 Browse Files
- 【ID1032412】【订单聚合层】核销传入优惠金额之传劵优惠取正直 · 790fc2b3
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  790fc2b3 Browse Files
- Merge branch 'feature/20210616-记录三方调用结果-wsc' into qa · 33c625ef
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
```
  王世昌 committed Jun 23, 2021
  33c625ef Browse Files
- 加挡板用于测试模拟核销券失败 · 5f07845b
  王世昌 committed Jun 23, 2021
  
  5f07845b Browse Files
- 加挡板用于测试模拟核销券失败 · d2b79caf
  王世昌 committed Jun 23, 2021
  
  d2b79caf Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · c6404fe7
  周晓航 committed Jun 23, 2021
  
  c6404fe7 Browse Files
- 新算价添加日志 · 3432fb72
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 23, 2021
  3432fb72 Browse Files
- 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