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

12 Dec, 2020 5 commits
- 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 21 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
- Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa · 9961dd73
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/payment/OrderPayResponse.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 11, 2020
  9961dd73 Browse Files
- fix 机场支付 · a5e486cb
  张洪旺 committed Dec 11, 2020
  
  a5e486cb Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 8a919022
  张志恒 committed Dec 11, 2020
  
  8a919022 Browse Files
- 抖音支付新增抖音Id和openId · 9a187dad
  张志恒 committed Dec 11, 2020
  
  9a187dad Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · 0fb30e44
  刘鹏飞 committed Dec 11, 2020
  
  0fb30e44 Browse Files
- coco验证券的异常修改异常抛出类 · a7e21881
  刘鹏飞 committed Dec 11, 2020
  
  a7e21881 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 14 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