Commits · 56398b71c934183a0b17d4833d06a5095a245294 · order-group-application / order-group · GitLab

17 Jun, 2021 20 commits
- Merge branch 'feature/20210609-v2.0.34-购物车支持配送券ID1030707-周晓航' into qa · 56398b71
  周晓航 committed Jun 17, 2021
  
  56398b71 Browse Files
- 调用会员优惠券接口新增参数 · 2ee33af0
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 17, 2021
  2ee33af0 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 698b93ad
  徐康 committed Jun 17, 2021
  
  698b93ad Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · 7cc48480
  徐康 committed Jun 17, 2021
  
  7cc48480 Browse Files
- 核销券 · c04a8c26
  徐康 committed Jun 17, 2021
  
  c04a8c26 Browse Files
- Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa · 0a4528f5
  周晓航 committed Jun 17, 2021
  
  0a4528f5 Browse Files
- Merge branch 'feature/20210608_【技术线】【订单】服务打印日志删减——购物车聚合服务_wanghanghang' into qa · 4c405242
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java
```
  hanghang.wang committed Jun 17, 2021
  4c405242 Browse Files
- Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' into qa · 9ce13600
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  周晓航 committed Jun 17, 2021
  9ce13600 Browse Files
- Merge remote-tracking branch 'origin/feature/20210608_判断是是否一次性卖券商品订单_wanghanghang' into qa · 9727e987
  hanghang.wang committed Jun 17, 2021
  
  9727e987 Browse Files
- 促销接口变动 · 69b0a5d0
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 17, 2021
  69b0a5d0 Browse Files
- Merge branch 'feature/xukang_20210609_麦咖啡p7v2' into qa · db79d254
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  徐康 committed Jun 17, 2021
  db79d254 Browse Files
- 升级sdk · 8d3090df
  徐康 committed Jun 17, 2021
  
  8d3090df Browse Files
- 商品校验 · 6380ca4d
  徐康 committed Jun 17, 2021
  
  6380ca4d Browse Files
- 购物车支持多张券进行选择========== qa环境代码修改- 基于购物车重构 · f783038b
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 17, 2021
  f783038b Browse Files
- 下单和发券 · 86373e8b
  徐康 committed Jun 17, 2021
  
  86373e8b 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 20 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
- 注释老sdk无效代码合并master就好了 · 82931a21
```
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
```
  周晓航 committed Jun 16, 2021
  82931a21 Browse Files
- 一次性卖券调整 · b65bbc46
  hanghang.wang committed Jun 16, 2021
  
  b65bbc46 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