Commits · 9a187dad00dd011961dbbec501b919eecf388973 · order-group-application / order-group · GitLab

11 Dec, 2020 8 commits
- 抖音支付新增抖音Id和openId · 9a187dad
  张志恒 committed Dec 11, 2020
  
  9a187dad Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into qa · 5d720f5a
  张志恒 committed Dec 11, 2020
  
  5d720f5a Browse Files
- 配送进程 · 2e10b5cb
  邓杰 committed Dec 11, 2020
  
  2e10b5cb Browse Files
- 抖音支付新增抖音Id和openId · b777e5a5
  张志恒 committed Dec 11, 2020
  
  b777e5a5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · ba8ec3fc
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
```
  刘鹏飞 committed Dec 11, 2020
  ba8ec3fc Browse Files
- 修改版本号 · 702b9cc7
  刘鹏飞 committed Dec 11, 2020
  
  702b9cc7 Browse Files
- 修改版本号 · a5dadfc0
  刘鹏飞 committed Dec 11, 2020
  
  a5dadfc0 Browse Files
- 买一送一寄件传参 · e83d323b
  刘鹏飞 committed Dec 11, 2020
  
  e83d323b Browse Files
10 Dec, 2020 19 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 7d017956
  刘鹏飞 committed Dec 10, 2020
  
  7d017956 Browse Files
- 新版支付有礼物 · 78a786df
  刘鹏飞 committed Dec 10, 2020
  
  78a786df Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · f6fa5c99
  刘鹏飞 committed Dec 10, 2020
  
  f6fa5c99 Browse Files
- coco批量使用优惠券。修改活动号入参 · 4f3b7e86
  刘鹏飞 committed Dec 10, 2020
  
  4f3b7e86 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 72bd31d0
```
Feature/20201208 collage order miaohui

See merge request !81
```
  缪晖 committed Dec 10, 2020
  72bd31d0 Browse Files
- 买一赠一对应关系补充 · 22559790
  缪晖 committed Dec 10, 2020
  
  22559790 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · b2762699
  chongfu.liang committed Dec 10, 2020
  
  b2762699 Browse Files
- 商品券添加库存校验 · c25f841e
  chongfu.liang committed Dec 10, 2020
  
  c25f841e Browse Files
- 预发布环境问题修复 · 5e655801
  缪晖 committed Dec 10, 2020
  
  5e655801 Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa · a182841d
  徐康 committed Dec 10, 2020
  
  a182841d Browse Files
- 退款回调 · ed0a8901
  徐康 committed Dec 10, 2020
  
  ed0a8901 Browse Files
- 配送进程 · c575b6b2
  邓杰 committed Dec 10, 2020
  
  c575b6b2 Browse Files
- sunyu::update::fix conflicts about productGroup add material · d1f00781
  孙昱 committed Dec 10, 2020
  
  d1f00781 Browse Files
- Merge branch 'feature/20201210_可选商品加料需求_yu.sun' into qa · d5b5a554
  孙昱 committed Dec 10, 2020
  
  d5b5a554 Browse Files
- sunyu::update::new function about productGroup add material · fa1caca6
  孙昱 committed Dec 10, 2020
  
  fa1caca6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · db89b3da
  刘鹏飞 committed Dec 10, 2020
  
  db89b3da Browse Files
- coco赠品打标 · b98b7c2c
  刘鹏飞 committed Dec 10, 2020
  
  b98b7c2c Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into qa · 7c29feb9
  chongfu.liang committed Dec 10, 2020
  
  7c29feb9 Browse Files
- 返回校验 · 543ca356
  chongfu.liang committed Dec 10, 2020
  
  543ca356 Browse Files
09 Dec, 2020 13 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 845d9115
```
包装费透传问题

See merge request !75
```
  缪晖 committed Dec 10, 2020
  845d9115 Browse Files
- 包装费透传问题 · e107cb62
  缪晖 committed Dec 10, 2020
  
  e107cb62 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 632ad43f
```
直接从促销goods获取均摊总优惠金额

See merge request !73
```
  缪晖 committed Dec 10, 2020
  632ad43f Browse Files
- 直接从促销goods获取均摊总优惠金额 · 3a4a7525
  缪晖 committed Dec 10, 2020
  
  3a4a7525 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · debe06cc
```
Update TimeSalePromotionService.java

See merge request !72
```
  缪晖 committed Dec 09, 2020
  debe06cc Browse Files
- Update TimeSalePromotionService.java · 967ad5ee
  缪晖 committed Dec 09, 2020
  
  967ad5ee Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · 79625d9c
```
Update ShoppingCartCollageServiceImpl.java

See merge request !70
```
  缪晖 committed Dec 09, 2020
  79625d9c Browse Files
- Update ShoppingCartCollageServiceImpl.java · 28ba4084
  缪晖 committed Dec 09, 2020
  
  28ba4084 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 137bf983
  刘鹏飞 committed Dec 09, 2020
  
  137bf983 Browse Files
- coco现单价使用促销的价格 · 51933f8a
  刘鹏飞 committed Dec 09, 2020
  
  51933f8a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · a67b25ab
  刘鹏飞 committed Dec 09, 2020
  
  a67b25ab Browse Files
- coco现价使用促销返回的价格 · 2a737785
  刘鹏飞 committed Dec 09, 2020
  
  2a737785 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'qa' · c2bc8e14
```
重新计算购物车行优惠信息

See merge request !69
```
  缪晖 committed Dec 09, 2020
  c2bc8e14 Browse Files