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

10 Dec, 2020 9 commits
- 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
- 买一赠一对应关系补充 · 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
- 预发布环境问题修复 · 5e655801
  缪晖 committed Dec 10, 2020
  
  5e655801 Browse Files
- 配送进程 · af57b7a1
  邓杰 committed Dec 10, 2020
  
  af57b7a1 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · e9bdf4e1
```
包装费透传问题

See merge request !76
```
  缪晖 committed Dec 10, 2020
  e9bdf4e1 Browse Files
- Merge branch 'feature/20201112_套餐价格计算_yu.sun' into develop · 6ee047d8
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java
```
  孙昱 committed Dec 10, 2020
  6ee047d8 Browse Files
- 返回校验 · 543ca356
  chongfu.liang committed Dec 10, 2020
  
  543ca356 Browse Files
09 Dec, 2020 31 commits
- 包装费透传问题 · e107cb62
  缪晖 committed Dec 10, 2020
  
  e107cb62 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 87d4b340
```
Feature/20201208 collage order miaohui

See merge request !74
```
  缪晖 committed Dec 10, 2020
  87d4b340 Browse Files
- 直接从促销goods获取均摊总优惠金额 · 3a4a7525
  缪晖 committed Dec 10, 2020
  
  3a4a7525 Browse Files
- Update TimeSalePromotionService.java · 967ad5ee
  缪晖 committed Dec 09, 2020
  
  967ad5ee Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 288e8362
```
Feature/20201208 collage order miaohui

See merge request !71
```
  缪晖 committed Dec 09, 2020
  288e8362 Browse Files
- Update ShoppingCartCollageServiceImpl.java · 28ba4084
  缪晖 committed Dec 09, 2020
  
  28ba4084 Browse Files
- 重新计算购物车行优惠信息 · 8331e3f2
  缪晖 committed Dec 09, 2020
  
  8331e3f2 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 50068762
  孙昱 committed Dec 09, 2020
  
  50068762 Browse Files
- 拼单状态补充 · 31690b06
  缪晖 committed Dec 09, 2020
  
  31690b06 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · d23de111
```
Update CollageOrderController.java

See merge request !66
```
  缪晖 committed Dec 09, 2020
  d23de111 Browse Files
- Update CollageOrderController.java · c19b8cc7
  缪晖 committed Dec 09, 2020
  
  c19b8cc7 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 6eaa5a06
  孙昱 committed Dec 09, 2020
  
  6eaa5a06 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 8f1af77a
```
混合支付判断拼单状态

See merge request !64
```
  缪晖 committed Dec 09, 2020
  8f1af77a Browse Files
- 混合支付判断拼单状态 · a1bc6d26
  缪晖 committed Dec 09, 2020
  
  a1bc6d26 Browse Files
- 价格不校验 · b179412e
  chongfu.liang committed Dec 09, 2020
  
  b179412e Browse Files
- sunyu::conflicts::rollback about combo-product price calculate · a2dd136f
  孙昱 committed Dec 09, 2020
  
  a2dd136f Browse Files
- 配送进程 · f272821e
  邓杰 committed Dec 09, 2020
  
  f272821e Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 5cb4dcb7
  孙昱 committed Dec 09, 2020
  
  5cb4dcb7 Browse Files
- 配送进程 · 17318dce
  邓杰 committed Dec 09, 2020
  
  17318dce Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 99c33273
  孙昱 committed Dec 09, 2020
  
  99c33273 Browse Files
- Merge branch '20201127_coco配送进程' into develop · cd5b9a4d
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  邓杰 committed Dec 09, 2020
  cd5b9a4d Browse Files
- 配送方式 · 2ec1a59b
  邓杰 committed Dec 09, 2020
  
  2ec1a59b Browse Files
- 配送方式 · 18353351
  邓杰 committed Dec 09, 2020
  
  18353351 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into 'develop' · 9d5eddac
```
Feature/20201208 collage order miaohui

See merge request !62
```
  缪晖 committed Dec 09, 2020
  9d5eddac Browse Files
- 拼单参与人数字段添加 · a9755e76
  缪晖 committed Dec 09, 2020
  
  a9755e76 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 2bc85ff7
  孙昱 committed Dec 09, 2020
  
  2bc85ff7 Browse Files
- 当前登录人ID入参添加 · d6959505
  缪晖 committed Dec 09, 2020
  
  d6959505 Browse Files
- sunyu::conflicts::fix bug about combo-product price calculate · 753e3919
  孙昱 committed Dec 09, 2020
  
  753e3919 Browse Files
- 代码冲突处理 · 7dd75945
  缪晖 committed Dec 09, 2020
  
  7dd75945 Browse Files
- Merge branch 'feature/20201208_collageOrder_miaohui' into develop · 53f155dd
  缪晖 committed Dec 09, 2020
  
  53f155dd Browse Files
- 拼单混合支付提交 · 54482871
  缪晖 committed Dec 09, 2020
  
  54482871 Browse Files