Commits · 395a8a0d7a5b208f6509f5af2cf2cf07c8999642 · order-group-application / order-group · GitLab

13 Dec, 2020 12 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 395a8a0d
  刘鹏飞 committed Dec 13, 2020
  
  395a8a0d Browse Files
- coco订单详情拆行问题 · d73c31f5
  刘鹏飞 committed Dec 13, 2020
  
  d73c31f5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 4ba1667c
  刘鹏飞 committed Dec 13, 2020
  
  4ba1667c Browse Files
- coco购物车抽取公共的方法 · 24adb33c
  刘鹏飞 committed Dec 13, 2020
  
  24adb33c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 9bbd71c9
  刘鹏飞 committed Dec 13, 2020
  
  9bbd71c9 Browse Files
- coco订单详情要把参加了第二件半价的商品行拆成数量为1的多行 · 1bee447e
  刘鹏飞 committed Dec 13, 2020
  
  1bee447e Browse Files
- 去除测试日志 · 7e6c2517
  刘鹏飞 committed Dec 13, 2020
  
  7e6c2517 Browse Files
- 去除日志日志 · 173f8304
  刘鹏飞 committed Dec 13, 2020
  
  173f8304 Browse Files
- 去除日志日志 · 02679714
  刘鹏飞 committed Dec 13, 2020
  
  02679714 Browse Files
- 加点日志 · 8aa4929c
  刘鹏飞 committed Dec 13, 2020
  
  8aa4929c Browse Files
- 加点日志 · bc12229c
  刘鹏飞 committed Dec 13, 2020
  
  bc12229c Browse Files
- 加点日志 · 05e41b51
  刘鹏飞 committed Dec 13, 2020
  
  05e41b51 Browse Files
12 Dec, 2020 20 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 9f5793d4
  刘鹏飞 committed Dec 13, 2020
  
  9f5793d4 Browse Files
- coco结算页限时特价显示优惠后单价 · 2f0a068d
  刘鹏飞 committed Dec 13, 2020
  
  2f0a068d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 7f5d2fca
  刘鹏飞 committed Dec 13, 2020
  
  7f5d2fca Browse Files
- coco结算页拆行 · a780b5c7
  刘鹏飞 committed Dec 13, 2020
  
  a780b5c7 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 656f323e
  刘鹏飞 committed Dec 13, 2020
  
  656f323e Browse Files
- coco限时特价行显示优惠后的价格 · 59749faf
  刘鹏飞 committed Dec 13, 2020
  
  59749faf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · e2bc63c1
  刘鹏飞 committed Dec 13, 2020
  
  e2bc63c1 Browse Files
- coco限时特价行显示优惠后的价格 · ed52bf8d
  刘鹏飞 committed Dec 13, 2020
  
  ed52bf8d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 04c7c8f3
  刘鹏飞 committed Dec 12, 2020
  
  04c7c8f3 Browse Files
- coco的购物车的半价行价格 · e5b18bcb
  刘鹏飞 committed Dec 12, 2020
  
  e5b18bcb Browse Files
- coco的购物车的半价行价格 · 5baad42a
  刘鹏飞 committed Dec 12, 2020
  
  5baad42a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · becc54dd
  刘鹏飞 committed Dec 12, 2020
  
  becc54dd Browse Files
- coco的购物车的半价行 · d623960b
  刘鹏飞 committed Dec 12, 2020
  
  d623960b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 0530516c
  刘鹏飞 committed Dec 12, 2020
  
  0530516c Browse Files
- coco的购物车tip提示修改0元值判断 · 62c1daf1
  刘鹏飞 committed Dec 12, 2020
  
  62c1daf1 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · f3f16ff2
  刘鹏飞 committed Dec 12, 2020
  
  f3f16ff2 Browse Files
- coco的购物车tip提示从做 · f5ab77e2
  刘鹏飞 committed Dec 12, 2020
  
  f5ab77e2 Browse Files
- 配送进程 · 373b337c
  邓杰 committed Dec 12, 2020
  
  373b337c Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · da897961
  刘鹏飞 committed Dec 12, 2020
  
  da897961 Browse Files
- coco购物车的提示语要展示当前减少的活动金额 · d529e8f4
  刘鹏飞 committed Dec 12, 2020
  
  d529e8f4 Browse Files
11 Dec, 2020 8 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 02420ef0
```
Update BuyAndGiftsPromotionService.java

See merge request !86
```
  缪晖 committed Dec 11, 2020
  02420ef0 Browse Files
- Update BuyAndGiftsPromotionService.java · ac92bfaa
  缪晖 committed Dec 11, 2020
  
  ac92bfaa Browse Files
- sdk update · 9fa98e65
  缪晖 committed Dec 11, 2020
  
  9fa98e65 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · bc98f99e
```
组合商品加购人对应关系绑定问题修复

See merge request !83
```
  缪晖 committed Dec 11, 2020
  bc98f99e Browse Files
- 组合商品加购人对应关系绑定问题修复 · cf249e38
  缪晖 committed Dec 11, 2020
  
  cf249e38 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 891b841f
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartClearRequestVo.java
```
  刘鹏飞 committed Dec 11, 2020
  891b841f Browse Files
- coco清空购物车后要获取基础运费 · 6fc15eb6
  刘鹏飞 committed Dec 11, 2020
  
  6fc15eb6 Browse Files
- fix 机场支付 · c61b3829
  张洪旺 committed Dec 11, 2020
  
  c61b3829 Browse Files