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

12 May, 2020 18 commits
- Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of… · a14d3550
```
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed May 12, 2020
  a14d3550 Browse Files
- 商品不存在提示 · f41f2bdd
  ping.wu committed May 12, 2020
  
  f41f2bdd Browse Files
- 订单详情增加字段 · 7d219b56
  xiang.ru committed May 12, 2020
  
  7d219b56 Browse Files
- Merge branch 'feature/20200429客如云查询订单详情增加返回字段-rux' into develop · 654c583f
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
```
  xiang.ru committed May 12, 2020
  654c583f Browse Files
- 订单详情增加字段 · 58d01252
  xiang.ru committed May 12, 2020
  
  58d01252 Browse Files
- Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of… · 15f20cd6
```
Merge branches 'develop' and 'feature/20200423_蜜雪新下单接口_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed May 12, 2020
  15f20cd6 Browse Files
- 非空参数校验 · b14a29df
  ping.wu committed May 12, 2020
  
  b14a29df Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' into develop · 47592672
  dingkai committed May 12, 2020
  
  47592672 Browse Files
- 删除不使用的import · 65e67bec
  dingkai committed May 12, 2020
  
  65e67bec Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' into develop · 6cd1a466
  dingkai committed May 12, 2020
  
  6cd1a466 Browse Files
- 删除日志 · 86bd4277
  dingkai committed May 12, 2020
  
  86bd4277 Browse Files
- Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa · d73daaab
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/readme.md
```
  姜海波 committed May 12, 2020
  d73daaab Browse Files
- 退单增加配送费选项 · 3eb42574
  姜海波 committed May 12, 2020
  
  3eb42574 Browse Files
- 退单增加配送费选项 · ad01669e
  姜海波 committed May 12, 2020
  
  ad01669e Browse Files
- 退单增加是否退运费配置 · 7911db59
  姜海波 committed May 12, 2020
  
  7911db59 Browse Files
- 支付sdk异常日志 · 35730e2e
  dingkai committed May 12, 2020
  
  35730e2e Browse Files
- 退单增加是否退运费配置 · 9788f32e
  姜海波 committed May 12, 2020
  
  9788f32e Browse Files
- 支付sdk异常日志 · ae421491
  dingkai committed May 12, 2020
  
  ae421491 Browse Files
11 May, 2020 22 commits
- 解决代码冲突 · dfba8230
  胡超 committed May 11, 2020
  
  dfba8230 Browse Files
- Merge remote-tracking branch 'origin/master' · a44adc45
  胡超 committed May 11, 2020
  
  a44adc45 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/2020323_1.9.17_rocketmq' · 2213ef44
  胡超 committed May 11, 2020
  
  2213ef44 Browse Files
- 支付sdk升级 · bb84b238
  dingkai committed May 11, 2020
  
  bb84b238 Browse Files
- Merge branch 'feature/1.9.21-支付sdk-dingkai' · 815906b5
  dingkai committed May 11, 2020
  
  815906b5 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_发票上报' · 3b4ec738
  xiaoer.li@freemud.com committed May 11, 2020
  
  3b4ec738 Browse Files
- 升级sdk->1.4.1.RELEASE · 89cdac29
  xiaoer.li@freemud.com committed May 11, 2020
  
  89cdac29 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.21_储值卡支付的订单' · 10c2fff6
  xiaoer.li@freemud.com committed May 11, 2020
  
  10c2fff6 Browse Files
- rocketmq.delivery.enable:false · e76d5c7d
  胡超 committed May 11, 2020
  
  e76d5c7d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.20_查询促销补门店和渠道分支ID' · 905cf802
  xiaoer.li@freemud.com committed May 11, 2020
  
  905cf802 Browse Files
- Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of… · 619655b8
```
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
```
  ping.wu committed May 11, 2020
  619655b8 Browse Files
- 积分抵扣描述修改 · 33d06947
  ping.wu committed May 11, 2020
  
  33d06947 Browse Files
- ES查询优化预约单调整 · ebf36126
  姜海波 committed May 11, 2020
  
  ebf36126 Browse Files
- Merge remote-tracking branches… · cafe3973
```
Merge remote-tracking branches 'remotes/origin/feature-2020/4/23-1.9.21-ES查询SDK方法升级-海波' and 'remotes/origin/feature-2020/4/23-1.9.21-预约单-海波'
```
  姜海波 committed May 11, 2020
  cafe3973 Browse Files
- Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of… · 54200b40
```
Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	order-application-service/pom.xml
```
  ping.wu committed May 11, 2020
  54200b40 Browse Files
- 申请退款基础服务就看切换 · ceeeb53f
  ping.wu committed May 11, 2020
  
  ceeeb53f Browse Files
- 升级聚合sdk版本 · 11286530
  shuhu.hou@freemud.cn committed May 11, 2020
  
  11286530 Browse Files
- Merge branch 'feature/20200506_订单分发器日志' · ffe9b42e
  shuhu.hou@freemud.cn committed May 11, 2020
  
  ffe9b42e Browse Files
- Merge branch 'feature/20200423_订单oms逆向流程' · df89149b
  shuhu.hou@freemud.cn committed May 11, 2020
  
  df89149b Browse Files
- 升级sdk-配送费实际金额 · f8f5ed8f
  胡超 committed May 11, 2020
  
  f8f5ed8f Browse Files
- Merge remote-tracking branch 'remotes/origin/feature_20200426_1.9.21_refundDeliveryFee' · 3050873f
  胡超 committed May 11, 2020
  
  3050873f Browse Files
- Merge branches 'feature/20200507_配置修改_明警' and 'master' of… · 68ffe811
```
Merge branches 'feature/20200507_配置修改_明警' and 'master' of gitlab.freemud.com:order-group-application/order-group
```
  张明警 committed May 11, 2020
  68ffe811 Browse Files