Commits · d720eca8620bb6159505308a225825a600f894fc · order-group-application / order-group

16 Dec, 2020 1 commit

Merge branch 'feature/20201214-买一增一赠品价格修改-lcf' into develop · d720eca8

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	call-back-service/pom.xml
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml

committed Dec 16, 2020

d720eca8 Browse Files

15 Dec, 2020 6 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 2c32edf0
```
goodsTag取值逻辑修正

See merge request !96
```
  缪晖 committed Dec 15, 2020
  2c32edf0 Browse Files
- goodsTag取值逻辑修正 · f2896b45
  缪晖 committed Dec 15, 2020
  
  f2896b45 Browse Files
- SDK升级 · 2be4bd99
  chongfu.liang committed Dec 15, 2020
  
  2be4bd99 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into develop · 5f5dd155
  chongfu.liang committed Dec 15, 2020
  
  5f5dd155 Browse Files
- 返回校验 · cfd03ae7
  chongfu.liang committed Dec 15, 2020
  
  cfd03ae7 Browse Files
- 买一增一价格修改 · a91d7897
  chongfu.liang committed Dec 15, 2020
  
  a91d7897 Browse Files
14 Dec, 2020 4 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into develop · a2dfe842
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  缪晖 committed Dec 14, 2020
  a2dfe842 Browse Files
- goodsTag新增列表配置 · 586ea14a
  缪晖 committed Dec 14, 2020
  
  586ea14a Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 304986ba
```
拼单组合商品优惠价格计算修复

See merge request !88
```
  缪晖 committed Dec 14, 2020
  304986ba Browse Files
- 拼单组合商品优惠价格计算修复 · 8f2ee0e8
  缪晖 committed Dec 14, 2020
  
  8f2ee0e8 Browse Files
12 Dec, 2020 1 commit
- 配送进程 · 7eafead1
  邓杰 committed Dec 12, 2020
  
  7eafead1 Browse Files
11 Dec, 2020 15 commits
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 525d2699
```
Update BuyAndGiftsPromotionService.java

See merge request !87
```
  缪晖 committed Dec 11, 2020
  525d2699 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · b52a6964
```
Update BuyAndGiftsPromotionService.java

See merge request !85
```
  缪晖 committed Dec 11, 2020
  b52a6964 Browse Files
- Update BuyAndGiftsPromotionService.java · ac92bfaa
  缪晖 committed Dec 11, 2020
  
  ac92bfaa Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 405b023e
```
组合商品加购人对应关系绑定问题修复

See merge request !84
```
  缪晖 committed Dec 11, 2020
  405b023e Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 9d08f345
```
组合商品加购人对应关系绑定问题修复

See merge request !82
```
  缪晖 committed Dec 11, 2020
  9d08f345 Browse Files
- 组合商品加购人对应关系绑定问题修复 · cf249e38
  缪晖 committed Dec 11, 2020
  
  cf249e38 Browse Files
- 抖音支付新增抖音Id和openId · 185e5f7d
  张志恒 committed Dec 11, 2020
  
  185e5f7d Browse Files
- 抖音支付新增抖音Id和openId · e4525692
  张志恒 committed Dec 11, 2020
  
  e4525692 Browse Files
- Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop · e1f90843
  张志恒 committed Dec 11, 2020
  
  e1f90843 Browse Files
- Merge branch 'develop' of… · b707da90
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  邓杰 committed Dec 11, 2020
  b707da90 Browse Files
- 配送进程 · 460d0feb
  邓杰 committed Dec 11, 2020
  
  460d0feb Browse Files
- 抖音支付新增抖音Id和openId · b777e5a5
  张志恒 committed Dec 11, 2020
  
  b777e5a5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · f9bc24fa
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Dec 11, 2020
  f9bc24fa Browse Files
- 修改版本号 · a5dadfc0
  刘鹏飞 committed Dec 11, 2020
  
  a5dadfc0 Browse Files
- 买一送一寄件传参 · e83d323b
  刘鹏飞 committed Dec 11, 2020
  
  e83d323b Browse Files
10 Dec, 2020 13 commits
- 新版支付有礼物 · 78a786df
  刘鹏飞 committed Dec 10, 2020
  
  78a786df Browse Files
- Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group · 883765f5
  yu.sun committed Dec 10, 2020
  
  883765f5 Browse Files
- coco批量使用优惠券。修改活动号入参 · 4f3b7e86
  刘鹏飞 committed Dec 10, 2020
  
  4f3b7e86 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 2a55595b
```
Feature/20201208 collage order miaohui

See merge request !80
```
  缪晖 committed Dec 10, 2020
  2a55595b Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 0e309673
```
买一赠一对应关系补充

See merge request !79
```
  缪晖 committed Dec 10, 2020
  0e309673 Browse Files
- 买一赠一对应关系补充 · 22559790
  缪晖 committed Dec 10, 2020
  
  22559790 Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into develop · 38292771
  chongfu.liang committed Dec 10, 2020
  
  38292771 Browse Files
- 商品券添加库存校验 · c25f841e
  chongfu.liang committed Dec 10, 2020
  
  c25f841e Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'master' · 6bda0308
```
预发布环境问题修复

See merge request !78
```
  缪晖 committed Dec 10, 2020
  6bda0308 Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' · 980f043a
```
# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java
```
  徐康 committed Dec 10, 2020
  980f043a Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' · 01287fbb
  yu.sun committed Dec 10, 2020
  
  01287fbb Browse Files
- 预发布环境问题修复 · 5e655801
  缪晖 committed Dec 10, 2020
  
  5e655801 Browse Files
- 配送进程 · af57b7a1
  邓杰 committed Dec 10, 2020
  
  af57b7a1 Browse Files