Commits · 1f37088f5017741f2a5af0aa74ec45e939e0a7ff · order-group-application / order-group · GitLab

20 Aug, 2020 5 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 1f37088f
  xiaoer.li@freemud.com committed Aug 20, 2020
  
  1f37088f Browse Files
- fix 促销均摊拆分小料数量 · 455d911b
  xiaoer.li@freemud.com committed Aug 20, 2020
  
  455d911b Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 7c2f87a5
  zhiheng.zhang committed Aug 20, 2020
  
  7c2f87a5 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · c010847f
  zhiheng.zhang committed Aug 20, 2020
  
  c010847f Browse Files
- 返回值修改statusCode · 015b96d2
  zhiheng.zhang committed Aug 20, 2020
  
  015b96d2 Browse Files
19 Aug, 2020 19 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 0511fc0c
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  0511fc0c Browse Files
- fix均摊重复 · c83b361c
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  c83b361c Browse Files
- Merge branch 'feature/1.9.32-加料商品开发' into qa · dc01ed19
  chongfu.liang committed Aug 19, 2020
  
  dc01ed19 Browse Files
- 添加加料名称 · efa50943
  chongfu.liang committed Aug 19, 2020
  
  efa50943 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · dcbe7027
  vega committed Aug 19, 2020
  
  dcbe7027 Browse Files
- Merge branch 'feature/1.9.35-支付超时时间设置-肖家炜' into qa · e267b7f5
```
# 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
  e267b7f5 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 77e5e645
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  77e5e645 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 28b42dc6
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  28b42dc6 Browse Files
- fix均摊重复 · 0e71d128
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  0e71d128 Browse Files
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' into qa · 9fc0d93c
  zhiheng.zhang committed Aug 19, 2020
  
  9fc0d93c Browse Files
- queryOrderByCode 方法添加时间戳参数（重复去除） · f0b82153
  zhiheng.zhang committed Aug 19, 2020
  
  f0b82153 Browse Files
- Merge branch 'feature/2020/08/013-1.9.35-停车场查询优化-张志恒' into qa · ce1b0e51
  zhiheng.zhang committed Aug 19, 2020
  
  ce1b0e51 Browse Files
- queryOrderByCode 方法添加时间戳参数 · 07c46363
  zhiheng.zhang committed Aug 19, 2020
  
  07c46363 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 68f5ec90
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  68f5ec90 Browse Files
- 加料支持多活动均摊 · 58aa074b
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  58aa074b Browse Files
- feat:pom:支付sdk升级 · 642d8956
  vega committed Aug 19, 2020
  
  642d8956 Browse Files
- fix · 0b198d5d
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  0b198d5d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · c437e323
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  c437e323 Browse Files
- fix · af54c69e
  xiaoer.li@freemud.com committed Aug 19, 2020
  
  af54c69e Browse Files
18 Aug, 2020 16 commits
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 5257e2ce
  zhiheng.zhang committed Aug 18, 2020
  
  5257e2ce Browse Files
- 冲正和核销逻辑处理优化 · 268513db
  zhiheng.zhang committed Aug 18, 2020
  
  268513db Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 2c6e5eea
  zhiheng.zhang committed Aug 18, 2020
  
  2c6e5eea Browse Files
- 添加mq发送消息参数 · 9bf373fa
  zhiheng.zhang committed Aug 18, 2020
  
  9bf373fa Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · e18f40f9
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  e18f40f9 Browse Files
- 调整PK取值 · 19bd1176
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  19bd1176 Browse Files
- feature:createOrder:获取预支付时添加订单超时时间设置 · 4fc93b07
  vega committed Aug 18, 2020
  
  4fc93b07 Browse Files
- autotype fix · 6a9a91b0
  shuhu.hou@freemud.cn committed Aug 18, 2020
  
  6a9a91b0 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 17c7a795
  zhiheng.zhang committed Aug 18, 2020
  
  17c7a795 Browse Files
- 支付渠道添加判断是否为微信支付，如果是则锁定，否则核销 · 6975111d
  zhiheng.zhang committed Aug 18, 2020
  
  6975111d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 90bcab14
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  90bcab14 Browse Files
- 去掉行记录计算 · e5202df4
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  e5202df4 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 93c1569b
  zhiheng.zhang committed Aug 18, 2020
  
  93c1569b Browse Files
- 券码核销添加日志测试 · 97551040
  zhiheng.zhang committed Aug 18, 2020
  
  97551040 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · 024b14d6
  xiaoer.li@freemud.com committed Aug 18, 2020
  
  024b14d6 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · e34be64e
```
# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
```
  xiaoer.li@freemud.com committed Aug 18, 2020
  e34be64e Browse Files