Commits · abe93aa6b77aba21b2b32ba3c2c9829963ddf7ce · order-group-application / order-group · GitLab

24 Aug, 2020 5 commits
- Merge remote-tracking branch 'origin/qa' into qa · abe93aa6
  徐康 committed Aug 24, 2020
  
  abe93aa6 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · bec7f7b6
  徐康 committed Aug 24, 2020
  
  bec7f7b6 Browse Files
- 删除写死的测试数据 · 29db8434
  徐康 committed Aug 24, 2020
  
  29db8434 Browse Files
- Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of… · c8d0ff41
```
Merge branches 'feature/20200721_麦咖啡购物车_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa
```
  ping.wu committed Aug 24, 2020
  c8d0ff41 Browse Files
- 商品参与限时特价activityType返回2，用于前端显示特价标签 · 9e61932a
  ping.wu committed Aug 24, 2020
  
  9e61932a Browse Files
23 Aug, 2020 3 commits
- Merge remote-tracking branch 'origin/qa' into qa · e3816e92
  徐康 committed Aug 23, 2020
  
  e3816e92 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · ceeed3a1
  徐康 committed Aug 23, 2020
  
  ceeed3a1 Browse Files
- bug fix 营业时间判断错误 · f3d0c7ca
  徐康 committed Aug 23, 2020
  
  f3d0c7ca Browse Files
22 Aug, 2020 3 commits
- 不可用券返回修改 · cf9b6c82
  ping.wu committed Aug 22, 2020
  
  cf9b6c82 Browse Files
- Merge branch 'feature-2020/8/6-McCafe-会阳' into qa · ae9f6760
  huiyang.chen committed Aug 22, 2020
  
  ae9f6760 Browse Files
- 制作完成实现 · 98114413
  huiyang.chen committed Aug 22, 2020
  
  98114413 Browse Files
21 Aug, 2020 1 commit
- 蜜雪app支付回调bug修改 · 012be6e7
  huiyang.chen committed Aug 21, 2020
  
  012be6e7 Browse Files
20 Aug, 2020 20 commits
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 0a62f1ff
  xiaoer.li committed Aug 21, 2020
  
  0a62f1ff Browse Files
- fix · fbfee320
  xiaoer.li committed Aug 21, 2020
  
  fbfee320 Browse Files
- Merge remote-tracking branch 'origin/qa' into qa · fc9828c1
  徐康 committed Aug 20, 2020
  
  fc9828c1 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · de2348b5
  徐康 committed Aug 20, 2020
  
  de2348b5 Browse Files
- 创建订单时间check修改 · b7387336
  徐康 committed Aug 20, 2020
  
  b7387336 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · 137cd323
  zhiheng.zhang committed Aug 20, 2020
  
  137cd323 Browse Files
- 问题查到，删除多的日志 · b3c8323b
  zhiheng.zhang committed Aug 20, 2020
  
  b3c8323b Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 63290b69
  xiaoer.li@freemud.com committed Aug 20, 2020
  
  63290b69 Browse Files
- 活动明细均摊累加 · 25c11ede
  xiaoer.li@freemud.com committed Aug 20, 2020
  
  25c11ede Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into qa · f523af48
  zhiheng.zhang committed Aug 20, 2020
  
  f523af48 Browse Files
- 券码锁定返回添加日志定位 · 93248fad
  zhiheng.zhang committed Aug 20, 2020
  
  93248fad Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa · 375645d5
  徐康 committed Aug 20, 2020
  
  375645d5 Browse Files
- 创建订单时间check修改 · 2b2e8d88
  徐康 committed Aug 20, 2020
  
  2b2e8d88 Browse Files
- 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
- 购物车总金额不包括配送 · 312c4353
  ping.wu committed Aug 20, 2020
  
  312c4353 Browse Files
- 超值加购类型返回 · df5ada88
  ping.wu committed Aug 20, 2020
  
  df5ada88 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 8 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
- 保存新的优惠类型超值加购 · 3762e3c7
  徐康 committed Aug 19, 2020
  
  3762e3c7 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