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

17 Jun, 2021 6 commits
- 购物车支持多张券进行选择========== qa环境代码修改- 基于购物车重构 · f783038b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 17, 2021
  f783038b Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · 20f06642
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformListCartGoodsService.java
```
  周晓航 committed Jun 17, 2021
  20f06642 Browse Files
- 购物车支持多张券进行选择 · 7392e8ae
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 17, 2021
  7392e8ae Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 917c9981
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
```
  徐康 committed Jun 17, 2021
  917c9981 Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into… · d8845837
```
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
```
  徐康 committed Jun 17, 2021
  d8845837 Browse Files
- 下单和发券 · fcce0295
  徐康 committed Jun 17, 2021
  
  fcce0295 Browse Files
16 Jun, 2021 34 commits
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · 0e087ded
  周晓航 committed Jun 16, 2021
  
  0e087ded Browse Files
- 兼容老代码逻辑 · 178c9141
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 16, 2021
  178c9141 Browse Files
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · 146f0285
  周晓航 committed Jun 16, 2021
  
  146f0285 Browse Files
- 打日志 · a23478b7
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 16, 2021
  a23478b7 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 30da3701
  徐康 committed Jun 16, 2021
  
  30da3701 Browse Files
- 初始化信息 · 36ba3b5a
  徐康 committed Jun 16, 2021
  
  36ba3b5a Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 4b8538a3
  徐康 committed Jun 16, 2021
  
  4b8538a3 Browse Files
- Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into… · ed35712b
```
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
```
  徐康 committed Jun 16, 2021
  ed35712b Browse Files
- 值转换 · 9bf008de
  徐康 committed Jun 16, 2021
  
  9bf008de Browse Files
- Merge remote-tracking branch 'origin/feature/20210608_判断是是否一次性卖券商品订单_wanghanghang' into qa · 20471432
  hanghang.wang committed Jun 16, 2021
  
  20471432 Browse Files
- 一次性卖券调整 · 783a13a2
  hanghang.wang committed Jun 16, 2021
  
  783a13a2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 85d04a5f
  徐康 committed Jun 16, 2021
  
  85d04a5f Browse Files
- 日志 · 93135153
  徐康 committed Jun 16, 2021
  
  93135153 Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · c602d582
  徐康 committed Jun 16, 2021
  
  c602d582 Browse Files
- goodsId取值 · 904c22cf
  徐康 committed Jun 16, 2021
  
  904c22cf Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · fe8ab1c1
  周晓航 committed Jun 16, 2021
  
  fe8ab1c1 Browse Files
- Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa · dd2942c7
  周晓航 committed Jun 16, 2021
  
  dd2942c7 Browse Files
- bug修复 · 6b9c2861
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 16, 2021
  6b9c2861 Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · 80c5d8b3
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Jun 16, 2021
  80c5d8b3 Browse Files
- 更新操作 · 3eaf122d
  徐康 committed Jun 16, 2021
  
  3eaf122d Browse Files
- merge冲突 · 5d12569a
  王世昌 committed Jun 16, 2021
  
  5d12569a Browse Files
- Merge branch 'feature/20210616-记录三方调用结果-wsc' into qa · b9128025
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
```
  王世昌 committed Jun 16, 2021
  b9128025 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3fb7c7f1
  徐康 committed Jun 16, 2021
  
  3fb7c7f1 Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · db05cc19
  徐康 committed Jun 16, 2021
  
  db05cc19 Browse Files
- 操作类型 · 3a6dfff2
  徐康 committed Jun 16, 2021
  
  3a6dfff2 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 3a42a777
  张跃 committed Jun 16, 2021
  
  3a42a777 Browse Files
- 新老接口判断 · 38e541db
  张跃 committed Jun 16, 2021
  
  38e541db Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · f52d30d7
  徐康 committed Jun 16, 2021
  
  f52d30d7 Browse Files
- 小数 · fe59b2a6
  徐康 committed Jun 16, 2021
  
  fe59b2a6 Browse Files
- Merge branch 'feature/xukang_20200601_麦咖啡P7V1' into qa · bec27722
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
```
  徐康 committed Jun 16, 2021
  bec27722 Browse Files
- 默认选中赠品 · 7e465ef8
  徐康 committed Jun 16, 2021
  
  7e465ef8 Browse Files
- 记录三方调用结果 · 35a4cef3
  王世昌 committed Jun 16, 2021
  
  35a4cef3 Browse Files
- 新老接口判断 · fb97dd77
  张跃 committed Jun 16, 2021
  
  fb97dd77 Browse Files
- 修改内部内使用 · a5bc6a23
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 16, 2021
  a5bc6a23 Browse Files