Commits · 2131419f637526df05d1c7f971bcd1570f6b455f · order-group-application / order-group · GitLab

19 Aug, 2020 2 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 2131419f
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 19, 2020
  2131419f Browse Files
- 活动键位编号对接 · a716e420
  ping.wu committed Aug 19, 2020
  
  a716e420 Browse Files
18 Aug, 2020 13 commits
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 8fa3dc2d
  zhiheng.zhang committed Aug 18, 2020
  
  8fa3dc2d Browse Files
- 冲正和核销逻辑处理优化 · 268513db
  zhiheng.zhang committed Aug 18, 2020
  
  268513db Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 717cbc8a
  zhiheng.zhang committed Aug 18, 2020
  
  717cbc8a Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 5bc482e8
  zhiheng.zhang committed Aug 18, 2020
  
  5bc482e8 Browse Files
- 添加mq发送消息参数 · 9bf373fa
  zhiheng.zhang committed Aug 18, 2020
  
  9bf373fa Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' into develop · 95a5e593
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  vega committed Aug 18, 2020
  95a5e593 Browse Files
- feature:createOrder:获取预支付时添加订单超时时间设置 · 4fc93b07
  vega committed Aug 18, 2020
  
  4fc93b07 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 19207df6
  zhiheng.zhang committed Aug 18, 2020
  
  19207df6 Browse Files
- 支付渠道添加判断是否为微信支付，如果是则锁定，否则核销 · 6975111d
  zhiheng.zhang committed Aug 18, 2020
  
  6975111d Browse Files
- 商品券调整 · 6f54fa80
  ping.wu committed Aug 18, 2020
  
  6f54fa80 Browse Files
- 券码核销添加日志测试 · 97551040
  zhiheng.zhang committed Aug 18, 2020
  
  97551040 Browse Files
- 券码核销添加日志测试 · 490efa21
  zhiheng.zhang committed Aug 18, 2020
  
  490efa21 Browse Files
- 新版核销后无需调用移除卡包功能，只需要调用核销逻辑 · 956cf184
  zhiheng.zhang committed Aug 18, 2020
  
  956cf184 Browse Files
17 Aug, 2020 20 commits
- 删除多余的方法 · 3c432034
  zhiheng.zhang committed Aug 17, 2020
  
  3c432034 Browse Files
- 添加异常信息 · 6dd3c8de
  zhiheng.zhang committed Aug 17, 2020
  
  6dd3c8de Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · e945390a
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 17, 2020
  e945390a Browse Files
- 套餐商品促销计算数量调整 · 530d1fe6
  ping.wu committed Aug 17, 2020
  
  530d1fe6 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 2ab119a7
  huiyang.chen committed Aug 17, 2020
  
  2ab119a7 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 426038c5
  徐康 committed Aug 17, 2020
  
  426038c5 Browse Files
- Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into… · a094f7b7
```
Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由
```
  huiyang.chen committed Aug 17, 2020
  a094f7b7 Browse Files
- Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into… · b4eb997d
```
Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由
```
  徐康 committed Aug 17, 2020
  b4eb997d Browse Files
- 配送回调地址修改 · 6573eeda
  huiyang.chen committed Aug 17, 2020
  
  6573eeda Browse Files
- 预约到店订单在超过预约时间之前可以申请退款 · f943793c
  徐康 committed Aug 17, 2020
  
  f943793c Browse Files
- 购物车sdk · 176b818c
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  176b818c Browse Files
- 购物车sdk · 26ffb5f1
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  26ffb5f1 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 4e775091
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  4e775091 Browse Files
- 购物车sdk · 57f5beca
  xiaoer.li@freemud.com committed Aug 17, 2020
  
  57f5beca Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 7fbaf53e
  zhiheng.zhang committed Aug 17, 2020
  
  7fbaf53e Browse Files
- queryOrderByCode方法添加 · 0a9f40dc
  zhiheng.zhang committed Aug 17, 2020
  
  0a9f40dc Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 96f7c628
```
# Conflicts:
#	assortment-shoppingcart-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
```
  xiaoer.li@freemud.com committed Aug 17, 2020
  96f7c628 Browse Files
- - 小料数量固定传1 · 9151db06
```
- 券码透传金额包含小料
- 均摊*主商品金额
```
  xiaoer.li@freemud.com committed Aug 17, 2020
  9151db06 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · 8ccfb009
  huiyang.chen committed Aug 17, 2020
  
  8ccfb009 Browse Files
- 税率设置为1 · 22643754
  huiyang.chen committed Aug 17, 2020
  
  22643754 Browse Files
16 Aug, 2020 2 commits
- 小料信息有异常直接从购物车中异常及提示 · 0bd8bba3
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  0bd8bba3 Browse Files
- fix · d35e7312
  xiaoer.li@freemud.com committed Aug 16, 2020
  
  d35e7312 Browse Files
15 Aug, 2020 3 commits
- 增加小料商品变化异常校验 · 8b79abd5
  xiaoer.li committed Aug 15, 2020
  
  8b79abd5 Browse Files
- 将小料异常标识在行记录上 · a5e0238b
  xiaoer.li committed Aug 15, 2020
  
  a5e0238b Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 85dd75b3
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 15, 2020
  85dd75b3 Browse Files