Commits · 9402742f0f43ebce0a45841511eb68347c5cceb9 · order-group-application / order-group · GitLab

20 Aug, 2020 7 commits
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 9402742f
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 20, 2020
  9402742f Browse Files
- 购物车总金额不包括配送 · 312c4353
  ping.wu committed Aug 20, 2020
  
  312c4353 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 57d92f7c
```
Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed Aug 20, 2020
  57d92f7c Browse Files
- 超值加购类型返回 · df5ada88
  ping.wu committed Aug 20, 2020
  
  df5ada88 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 38fa4570
  zhiheng.zhang committed Aug 20, 2020
  
  38fa4570 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 32fe1ac1
  zhiheng.zhang committed Aug 20, 2020
  
  32fe1ac1 Browse Files
- 返回值修改statusCode · 015b96d2
  zhiheng.zhang committed Aug 20, 2020
  
  015b96d2 Browse Files
19 Aug, 2020 13 commits
- Merge remote-tracking branch 'origin/develop' into develop · 75df6aa1
  vega committed Aug 19, 2020
  
  75df6aa1 Browse Files
- revert:OrderAdapter:取消注释 · 62a613e0
  vega committed Aug 19, 2020
  
  62a613e0 Browse Files
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' into develop · 03911570
  zhiheng.zhang committed Aug 19, 2020
  
  03911570 Browse Files
- queryOrderByCode 方法添加时间戳参数（重复去除） · f0b82153
  zhiheng.zhang committed Aug 19, 2020
  
  f0b82153 Browse Files
- queryOrderByCode 方法添加时间戳参数 · 07c46363
  zhiheng.zhang committed Aug 19, 2020
  
  07c46363 Browse Files
- Merge branches 'develop' and 'feature/20200721_麦咖啡购物车_wuping' of… · 2e48c4da
```
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
  2e48c4da Browse Files
- 特价活动优惠数量返回 · 74400eeb
  ping.wu committed Aug 19, 2020
  
  74400eeb Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' into develop · f8e6802d
  vega committed Aug 19, 2020
  
  f8e6802d Browse Files
- feat:pom:支付sdk升级 · 642d8956
  vega committed Aug 19, 2020
  
  642d8956 Browse Files
- Merge branch 'feature/1.9.34-预支付失败记录消息到reason-肖家炜' into develop · d3498d2f
  vega committed Aug 19, 2020
  
  d3498d2f Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' into develop · 9f1b3a27
```
# 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 19, 2020
  9f1b3a27 Browse Files
- 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 14 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
- feature:createOrder:预支付失败,返回的错误加上预支付失败前缀 · 390b5325
  vega committed Aug 18, 2020
  
  390b5325 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 6 commits
- 删除多余的方法 · 3c432034
  zhiheng.zhang committed Aug 17, 2020
  
  3c432034 Browse Files
- 添加异常信息 · 6dd3c8de
  zhiheng.zhang committed Aug 17, 2020
  
  6dd3c8de Browse Files
- 删除source属性 · f8f9882a
  zhiheng.zhang committed Aug 17, 2020
  
  f8f9882a 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