Commits · 2cc9840fcf93dbc509e5e7fd53d68f5eac10469c · order-group-application / order-group · GitLab

02 Dec, 2020 6 commits
- sdk版本升级 · 2cc9840f
  缪晖 committed Dec 02, 2020
  
  2cc9840f Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · ce4ae497
  张洪旺 committed Dec 02, 2020
  
  ce4ae497 Browse Files
- Merge branch '20201125-coco-zhw' of… · 5e860cea
```
Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  张洪旺 committed Dec 02, 2020
  5e860cea Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 51a28142
```
修改赠品归属逻辑

See merge request !28
```
  缪晖 committed Dec 02, 2020
  51a28142 Browse Files
- 修改赠品归属逻辑 · bd9db432
  缪晖 committed Dec 02, 2020
  
  bd9db432 Browse Files
- 叫号器 · e19cf506
  张洪旺 committed Dec 02, 2020
  
  e19cf506 Browse Files
01 Dec, 2020 34 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · efccf078
  刘鹏飞 committed Dec 01, 2020
  
  efccf078 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 35b8f3d9
  刘鹏飞 committed Dec 01, 2020
  
  35b8f3d9 Browse Files
- 构建coco赠品加入购物的逻辑 · 019f4c6b
  刘鹏飞 committed Dec 01, 2020
  
  019f4c6b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 48a84005
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 01, 2020
  48a84005 Browse Files
- 解决被删掉的代码 · a81dee7a
  刘鹏飞 committed Dec 01, 2020
  
  a81dee7a Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 4e7197bf
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 01, 2020
  4e7197bf Browse Files
- 解决被删掉的代码 · 39f45e0d
  刘鹏飞 committed Dec 01, 2020
  
  39f45e0d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · fd4bd14a
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 01, 2020
  fd4bd14a Browse Files
- 解决被删掉的代码 · a3d017a6
  刘鹏飞 committed Dec 01, 2020
  
  a3d017a6 Browse Files
- 升级依赖 · 89303183
  刘鹏飞 committed Dec 01, 2020
  
  89303183 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 34c6c138
  刘鹏飞 committed Dec 01, 2020
  
  34c6c138 Browse Files
- 买一赠一参数修改 · 9cd6519d
  刘鹏飞 committed Dec 01, 2020
  
  9cd6519d Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 05665952
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  05665952 Browse Files
- fix:冲突 · e9486475
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  e9486475 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · cf5aa074
```
清除自己的购物车调整

See merge request !27
```
  缪晖 committed Dec 01, 2020
  cf5aa074 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 16e434ea
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 01, 2020
  16e434ea Browse Files
- 清除自己的购物车调整 · 1389e782
  缪晖 committed Dec 01, 2020
  
  1389e782 Browse Files
- Merge branch 'feature/fix-混合支付优化券核销' into develop · 0867ba74
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 01, 2020
  0867ba74 Browse Files
- 购物车SDK版本升级 · 28ad0d9b
  缪晖 committed Dec 01, 2020
  
  28ad0d9b Browse Files
- Update OrderServiceImpl.java · afa8da80
  缪晖 committed Dec 01, 2020
  
  afa8da80 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 1a4309a3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  缪晖 committed Dec 01, 2020
  1a4309a3 Browse Files
- 拼单订单新增状态及订单编号回传机制 · 773ff967
  缪晖 committed Dec 01, 2020
  
  773ff967 Browse Files
- coco 模板消息 · d9a1f879
  张洪旺 committed Dec 01, 2020
  
  d9a1f879 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · afd8fe1a
  刘鹏飞 committed Dec 01, 2020
  
  afd8fe1a Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 5d3b043b
  刘鹏飞 committed Dec 01, 2020
  
  5d3b043b Browse Files
- 创单查询购物车赠品增加买一赠一寄件活动 · 2faf13d4
  刘鹏飞 committed Dec 01, 2020
  
  2faf13d4 Browse Files
- 优化：相关提示 · b50bc507
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  b50bc507 Browse Files
- 被冲代码补上 · 539929ff
  缪晖 committed Dec 01, 2020
  
  539929ff Browse Files
- ordercenter sdk 升级 · f6fafe4d
  张志恒 committed Dec 01, 2020
  
  f6fafe4d Browse Files
- 优化：混合支付 svc卡全额支付直接核销优惠券 · 272e4d50
  xiaoer.li@freemud.com committed Dec 01, 2020
  
  272e4d50 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 6b689cb8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
```
  缪晖 committed Dec 01, 2020
  6b689cb8 Browse Files
- 群收款去除门店ID · 9b003526
  缪晖 committed Dec 01, 2020
  
  9b003526 Browse Files
- 配送进程 · 02951072
  邓杰 committed Dec 01, 2020
  
  02951072 Browse Files
- Merge branch '20201127_coco配送进程' into develop · f2dd6fcf
  邓杰 committed Dec 01, 2020
  
  f2dd6fcf Browse Files