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

20 Aug, 2020 12 commits
- Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of… · ef1837d2
```
Merge branches 'develop' and 'feature/20200820_哗啦啦产品分类名称_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
```
  ping.wu committed Aug 20, 2020
  ef1837d2 Browse Files
- 统计分类编号 · 745eb004
  ping.wu committed Aug 20, 2020
  
  745eb004 Browse Files
- Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into develop · c2376eec
  徐康 committed Aug 20, 2020
  
  c2376eec Browse Files
- 创建订单时间check修改 · 2b2e8d88
  徐康 committed Aug 20, 2020
  
  2b2e8d88 Browse Files
- 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 branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' · 98856937
  zhiheng.zhang committed Aug 20, 2020
  
  98856937 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 18 commits
- 更改生产apollo配置 · 17c28147
  shuhu.hou@freemud.cn committed Aug 20, 2020
  
  17c28147 Browse Files
- 保存新的优惠类型超值加购 · 3762e3c7
  徐康 committed Aug 19, 2020
  
  3762e3c7 Browse Files
- 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
- 保存优惠数量 · b20411ef
  徐康 committed Aug 19, 2020
  
  b20411ef 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
- 券码服务版本号修改为release · 6570a565
  zhiheng.zhang committed Aug 19, 2020
  
  6570a565 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' · 32273e9a
  zhiheng.zhang committed Aug 19, 2020
  
  32273e9a 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 10 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 '20200806-10000' of gitlab.freemud.com:order-group-application/order-group · ca618c19
```
# 请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。
```
  张洪旺 committed Aug 18, 2020
  ca618c19 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
- autotype fix · 96c82dc0
  shuhu.hou@freemud.cn committed Aug 18, 2020
  
  96c82dc0 Browse Files
- Merge branch 'feature/2020/08/06-1.9.34-劵锁定与解锁-张志恒' into develop · 19207df6
  zhiheng.zhang committed Aug 18, 2020
  
  19207df6 Browse Files