Commits · 59796e5405f6effc63dc3bcca2a505f071cb0908 · order-group-application / order-group

02 Dec, 2020 20 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 59796e54
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  刘鹏飞 committed Dec 02, 2020
  59796e54 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · becd8e19
  刘鹏飞 committed Dec 02, 2020
  
  becd8e19 Browse Files
- 创建订单增加下单时间判断 · 07f2e13f
  刘鹏飞 committed Dec 02, 2020
  
  07f2e13f Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into develop · 7b8c101b
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  徐康 committed Dec 02, 2020
  7b8c101b Browse Files
- 修复问题 · 0aa26f99
  徐康 committed Dec 02, 2020
  
  0aa26f99 Browse Files
- 餐道主动退款原因 · 5363ee39
  徐康 committed Dec 02, 2020
  
  5363ee39 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 9ab48483
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Dec 02, 2020
  9ab48483 Browse Files
- 购物车赠品合并 · 95825d34
  刘鹏飞 committed Dec 02, 2020
  
  95825d34 Browse Files
- 配送进程 · d4876a71
  邓杰 committed Dec 02, 2020
  
  d4876a71 Browse Files
- 配送进程 · 710026d8
  邓杰 committed Dec 02, 2020
  
  710026d8 Browse Files
- Merge branch '20201127_coco配送进程' into develop · f66b4169
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/dto/ecology/SubscribeMessageRequest.java
```
  邓杰 committed Dec 02, 2020
  f66b4169 Browse Files
- 配送进程 · 1f7b8224
  邓杰 committed Dec 02, 2020
  
  1f7b8224 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · a5c5bb5d
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Dec 02, 2020
  a5c5bb5d Browse Files
- 赠品添加到购物车修改 · 86f76417
  刘鹏飞 committed Dec 02, 2020
  
  86f76417 Browse Files
- 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 20 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
- 配送进程 · 97e9ad97
  邓杰 committed Dec 01, 2020
  
  97e9ad97 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