Commits · 65d9f2a5a043acc5b4ac59e9df5eda344e70a482 · order-group-application / order-group · GitLab

08 Dec, 2020 2 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into develop · 65d9f2a5
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
```
  缪晖 committed Dec 08, 2020
  65d9f2a5 Browse Files
- 群收款金额扣除微信平台优惠及商户优惠 · 69c0e8a0
  缪晖 committed Dec 08, 2020
  
  69c0e8a0 Browse Files
07 Dec, 2020 24 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · e4053a11
```
限时特价及组合优惠修改

See merge request !55
```
  缪晖 committed Dec 07, 2020
  e4053a11 Browse Files
- 限时特价及组合优惠修改 · 9ce4acdf
  缪晖 committed Dec 07, 2020
  
  9ce4acdf Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 89ba45af
```
Feature/2.0.1 collage order 刘鹏飞

See merge request !54
```
  缪晖 committed Dec 07, 2020
  89ba45af Browse Files
- 群收款金额修复 · cc00472e
  缪晖 committed Dec 07, 2020
  
  cc00472e Browse Files
- Update ShoppingCartCollageServiceImpl.java · 55161e60
  缪晖 committed Dec 07, 2020
  
  55161e60 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 7f497c1b
```
拼单新增加车时间，用于给促销调用进行商品排序

See merge request !51
```
  缪晖 committed Dec 07, 2020
  7f497c1b Browse Files
- Merge branch 'feature/20201202-商品券换购券商品添加可售时间校验' into develop · 8fc70bc5
  chongfu.liang committed Dec 07, 2020
  
  8fc70bc5 Browse Files
- 商品可用时间添加校验 · e0b2e4df
  chongfu.liang committed Dec 07, 2020
  
  e0b2e4df Browse Files
- 配送方式 · e341079f
  邓杰 committed Dec 07, 2020
  
  e341079f Browse Files
- Merge branch '20201127_coco配送进程' into develop · 846db379
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  邓杰 committed Dec 07, 2020
  846db379 Browse Files
- 配送方式 · a6f62d39
  邓杰 committed Dec 07, 2020
  
  a6f62d39 Browse Files
- Merge branch 'feature/混合支付增加门店名称' into develop · d82adea8
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  d82adea8 Browse Files
- 混合支付增加门店名称 · c0ba56ad
  xiaoer.li@freemud.com committed Dec 07, 2020
  
  c0ba56ad Browse Files
- 拼单新增加车时间，用于给促销调用进行商品排序 · 882a4ef7
  缪晖 committed Dec 07, 2020
  
  882a4ef7 Browse Files
- Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into develop · 1b69529a
  徐康 committed Dec 07, 2020
  
  1b69529a Browse Files
- Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into develop · abca55b8
  徐康 committed Dec 07, 2020
  
  abca55b8 Browse Files
- 退款回调 · aaf75412
  徐康 committed Dec 07, 2020
  
  aaf75412 Browse Files
- 餐道价格 · 6c9a9c84
  徐康 committed Dec 07, 2020
  
  6c9a9c84 Browse Files
- Merge branch 'feature/2.0.6-农工商商品兑换券' into develop · 44cef829
  chongfu.liang committed Dec 07, 2020
  
  44cef829 Browse Files
- 添加发券数 · 310df7b4
  chongfu.liang committed Dec 07, 2020
  
  310df7b4 Browse Files
- 添加发券数 · 7533ea7e
  chongfu.liang committed Dec 07, 2020
  
  7533ea7e Browse Files
- 退款回调 · dc6b60ff
  徐康 committed Dec 07, 2020
  
  dc6b60ff Browse Files
- sunyu::conflicts::resolve merge code conflicts · 8d8a134a
  孙昱 committed Dec 07, 2020
  
  8d8a134a Browse Files
- sunyu::update::merge code · 508efe29
  孙昱 committed Dec 07, 2020
  
  508efe29 Browse Files
05 Dec, 2020 14 commits
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · ec9aea7a
```
Update ShoppingCartCollageServiceImpl.java

See merge request !49
```
  缪晖 committed Dec 05, 2020
  ec9aea7a Browse Files
- Update ShoppingCartCollageServiceImpl.java · caf094dc
  缪晖 committed Dec 05, 2020
  
  caf094dc Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · c1cb50b0
```
合车逻辑修正

See merge request !47
```
  缪晖 committed Dec 05, 2020
  c1cb50b0 Browse Files
- 合车逻辑修正 · 0889273c
  缪晖 committed Dec 05, 2020
  
  0889273c Browse Files
- 套餐价格 · 1344b16f
  徐康 committed Dec 05, 2020
  
  1344b16f Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 7d0bb42f
```
个人购物车将个人数据覆盖整单数据

See merge request !45
```
  缪晖 committed Dec 05, 2020
  7d0bb42f Browse Files
- 个人购物车将个人数据覆盖整单数据 · 2683568d
  缪晖 committed Dec 05, 2020
  
  2683568d Browse Files
- 使用购物车套餐价格 · f39d88f9
  徐康 committed Dec 05, 2020
  
  f39d88f9 Browse Files
- sunyu::update::fix bug about combo-product price calculate · 34275a17
  孙昱 committed Dec 05, 2020
  
  34275a17 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · dcb2a4df
```
个人购物车隐藏满减提示

See merge request !42
```
  缪晖 committed Dec 05, 2020
  dcb2a4df Browse Files
- 个人购物车隐藏满减提示 · 6a13d4a9
  缪晖 committed Dec 05, 2020
  
  6a13d4a9 Browse Files
- sunyu::fixbug::fix bug about combo-product calculate price · 25581b00
  孙昱 committed Dec 05, 2020
  
  25581b00 Browse Files
- Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into 'develop' · 58552dc3
```
Update CollageOrderServiceImpl.java

See merge request !41
```
  缪晖 committed Dec 05, 2020
  58552dc3 Browse Files
- Update CollageOrderServiceImpl.java · 2e3555a4
  缪晖 committed Dec 05, 2020
  
  2e3555a4 Browse Files