Commits · 8e8098bfdb490ddf02af2b6e27e25f7ff3b98fc1 · order-group-application / order-group · GitLab

04 Dec, 2020 14 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 8e8098bf
```
拼单购物车优惠金额修正

See merge request !37
```
  缪晖 committed Dec 04, 2020
  8e8098bf Browse Files
- 拼单购物车优惠金额修正 · 6d10418e
  缪晖 committed Dec 04, 2020
  
  6d10418e Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 23b8dda5
  刘鹏飞 committed Dec 04, 2020
  
  23b8dda5 Browse Files
- coco返回的活动中剔除集点活动 · 29c13d73
  刘鹏飞 committed Dec 04, 2020
  
  29c13d73 Browse Files
- Merge branch 'feature/20201204-1.0.10-加赠商品修改由行记录判断-lcf' into develop · 57a9d9a1
  chongfu.liang committed Dec 04, 2020
  
  57a9d9a1 Browse Files
- 升级sdk · d9df6923
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  d9df6923 Browse Files
- Merge branch 'feature/2.1.0_核销优惠券增加参数' into develop · cb9339f1
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
```
  xiaoer.li@freemud.com committed Dec 04, 2020
  cb9339f1 Browse Files
- 加赠商品修改 · 36c1fb8e
  chongfu.liang committed Dec 04, 2020
  
  36c1fb8e Browse Files
- Modify:带券订单下单成功直接锁券，支付完成核销 · 952c4dfd
  xiaoer.li@freemud.com committed Dec 04, 2020
  
  952c4dfd Browse Files
- Merge branch 'develop' of… · d9ff7fbf
```
Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

 Conflicts:
	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Dec 04, 2020
  d9ff7fbf Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 9edea7af
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
```
  刘鹏飞 committed Dec 04, 2020
  9edea7af Browse Files
- 购物车查询返回参数coco定制 · 372399fe
  刘鹏飞 committed Dec 04, 2020
  
  372399fe Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 36ab624c
```
修改拼单完成之后失效时间1分钟

See merge request !35
```
  缪晖 committed Dec 04, 2020
  36ab624c Browse Files
- 修改拼单完成之后失效时间1分钟 · 1970bc66
  缪晖 committed Dec 04, 2020
  
  1970bc66 Browse Files
03 Dec, 2020 18 commits
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 31ded084
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  刘鹏飞 committed Dec 03, 2020
  31ded084 Browse Files
- Merge branch 'feature/20201119-mixue-zhw' of gitlab.freemud.com:order-group-application/order-group · 93835de2
  张洪旺 committed Dec 03, 2020
  
  93835de2 Browse Files
- Merge remote-tracking branch 'origin/feature/coco-payGift-刘鹏飞' into feature/coco-payGift-刘鹏飞 · 5ff2597f
  刘鹏飞 committed Dec 03, 2020
  
  5ff2597f Browse Files
- coco订单详情赠品要合并到主商品 · 81d15b3d
  刘鹏飞 committed Dec 03, 2020
  
  81d15b3d Browse Files
- Merge branch '20201127_coco配送进程' into develop · d53c4189
  邓杰 committed Dec 03, 2020
  
  d53c4189 Browse Files
- 合并 · fb393951
  邓杰 committed Dec 03, 2020
  
  fb393951 Browse Files
- 合并 · 6fa48ed0
  邓杰 committed Dec 03, 2020
  
  6fa48ed0 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · d4fab69f
  刘鹏飞 committed Dec 03, 2020
  
  d4fab69f Browse Files
- 创建订单查询购物车增加购物车行返回 · 9379c4d4
  刘鹏飞 committed Dec 03, 2020
  
  9379c4d4 Browse Files
- dev问题临时修改 · a06fdf66
  缪晖 committed Dec 03, 2020
  
  a06fdf66 Browse Files
- Merge remote-tracking branch 'origin/feature/fix-混合支付优化券核销' · d8cab34d
  xiaoer.li@freemud.com committed Dec 03, 2020
  
  d8cab34d Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · b3ae39a9
```
拼单类型标识和包装费透传

See merge request !32
```
  缪晖 committed Dec 03, 2020
  b3ae39a9 Browse Files
- 拼单类型标识和包装费透传 · ed33ca76
  缪晖 committed Dec 03, 2020
  
  ed33ca76 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 199b1622
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
```
  谌会阳 committed Dec 03, 2020
  199b1622 Browse Files
- Merge branch '2020/11/3-买三赠一-huiyang' into develop · 6997f701
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
```
  谌会阳 committed Dec 03, 2020
  6997f701 Browse Files
- Merge remote-tracking branch 'origin/feature/2.05-商品券支持多商品' into develop · c3ffe111
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  xiaoer.li@freemud.com committed Dec 03, 2020
  c3ffe111 Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into develop · 1bb8daab
  徐康 committed Dec 03, 2020
  
  1bb8daab Browse Files
- 退款优化 · 3b9fa352
  徐康 committed Dec 03, 2020
  
  3b9fa352 Browse Files
02 Dec, 2020 8 commits
- SDK版本号升级 · 7122b0d0
  缪晖 committed Dec 02, 2020
  
  7122b0d0 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 8951e21e
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  缪晖 committed Dec 02, 2020
  8951e21e Browse Files
- 拼单加购人包装费 · f3a6f275
  缪晖 committed Dec 02, 2020
  
  f3a6f275 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 2b9ab905
  刘鹏飞 committed Dec 02, 2020
  
  2b9ab905 Browse Files
- 一个值被合没有了，修复回来 · 924ff6e6
  刘鹏飞 committed Dec 02, 2020
  
  924ff6e6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · 6fa7f70f
  刘鹏飞 committed Dec 02, 2020
  
  6fa7f70f Browse Files
- 如果是明天的预约单，不做下单时间检查 · 79fc9337
  刘鹏飞 committed Dec 02, 2020
  
  79fc9337 Browse Files
- 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