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

26 May, 2020 12 commits
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · f4fe53dd
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop
```
  ping.wu committed May 26, 2020
  f4fe53dd Browse Files
- 去掉版本号参数必填校验 · afd126bb
  ping.wu committed May 26, 2020
  
  afd126bb Browse Files
- 买券订单创建修改 · 0300aa1b
  ping.wu committed May 26, 2020
  
  0300aa1b Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · 79f5b505
```
# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed May 26, 2020
  79f5b505 Browse Files
- 升级聚合订单sdk · 9cd13be2
  shuhu.hou@freemud.cn committed May 26, 2020
  
  9cd13be2 Browse Files
- Merge branch 'feature-2020/5/14-1.9.23-客如云增加查询修改接口-海波' into develop · 4d177452
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
```
  haibo.jiang committed May 26, 2020
  4d177452 Browse Files
- 增加下游编号 · d89ae8c9
  haibo.jiang committed May 26, 2020
  
  d89ae8c9 Browse Files
- 升级聚合订单sdk · ae813a11
  shuhu.hou@freemud.cn committed May 26, 2020
  
  ae813a11 Browse Files
- Merge branch 'feature/20200525_会员价' into develop · 47144c4b
```
# Conflicts:
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed May 26, 2020
  47144c4b Browse Files
- 会员价调试 · 63d5368b
  shuhu.hou@freemud.cn committed May 26, 2020
  
  63d5368b Browse Files
- 会员价联调 · 11701220
  shuhu.hou@freemud.cn committed May 26, 2020
  
  11701220 Browse Files
- Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of… · db17540d
```
Merge branches 'develop' and 'feature/20200522_买券订单创建_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  ping.wu committed May 26, 2020
  db17540d Browse Files
25 May, 2020 24 commits
- 买券虚拟订单支付成功即订单给完成 · 70c66671
  ping.wu committed May 25, 2020
  
  70c66671 Browse Files
- 判断修改 · 65ec373d
  ping.wu committed May 25, 2020
  
  65ec373d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.23_待支付' into develop · cb69a1c0
  xiaoer.li@freemud.com committed May 25, 2020
  
  cb69a1c0 Browse Files
- 买券订单创建 · ab6e74ad
  ping.wu committed May 25, 2020
  
  ab6e74ad Browse Files
- Merge branch 'feature/1.9.23-围餐支付修复-20200525-dingkai' into develop · 306414e0
  dingkai committed May 25, 2020
  
  306414e0 Browse Files
- 围餐支付修复 · ed55b350
  dingkai committed May 25, 2020
  
  ed55b350 Browse Files
- Merge branch 'feature/1.9.25-mall-订单查询配送状态-20200525-dingkai' into develop · ac2e1ff2
  dingkai committed May 25, 2020
  
  ac2e1ff2 Browse Files
- 配送状态-1处理 · ad1ca083
  dingkai committed May 25, 2020
  
  ad1ca083 Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.24_升级订单分发器' into develop · d14acab0
  xiaoer.li@freemud.com committed May 25, 2020
  
  d14acab0 Browse Files
- call-back-service升级订单分发器 · 062b90a6
  xiaoer.li@freemud.com committed May 25, 2020
  
  062b90a6 Browse Files
- 删除、注释无用代码 · fe8f603c
  ping.wu committed May 25, 2020
  
  fe8f603c Browse Files
- Merge branch 'feature/1.9.24-fix-mall-20200522-dingkai' into develop · 2a3854cb
  dingkai committed May 25, 2020
  
  2a3854cb Browse Files
- 微商城查询 · 1eb9379c
  dingkai committed May 25, 2020
  
  1eb9379c Browse Files
- Merge branch 'feature/20200518_预支付新增点餐类型' into develop · b4daae86
```
# Conflicts:
#	order-application-service/pom.xml
```
  shuhu.hou@freemud.cn committed May 25, 2020
  b4daae86 Browse Files
- Merge branch 'feature-2020/5/25-1.9.24-升级售后查询sdk-海波' into develop · 10b6c9a8
```
# 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
```
  haibo.jiang committed May 25, 2020
  10b6c9a8 Browse Files
- Merge branch 'hotfix/20200522_同意退款取消配送单fixbug' · 5cb8e634
  shuhu.hou@freemud.cn committed May 25, 2020
  
  5cb8e634 Browse Files
- Merge branch 'feature/20200518_预支付新增点餐类型' · 4c18e633
  shuhu.hou@freemud.cn committed May 25, 2020
  
  4c18e633 Browse Files
- Merge branch 'feature-2020/5/25-1.9.24-升级售后查询sdk-海波' into develop · 8b8dc395
```
# 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
```
  haibo.jiang committed May 25, 2020
  8b8dc395 Browse Files
- Merge branch 'feature/20200513_添加购物车校验库存' · 363a6997
  shuhu.hou@freemud.cn committed May 25, 2020
  
  363a6997 Browse Files
- Merge branch 'feature-2020/5/25-1.9.24-升级售后查询sdk-海波' into develop · 2e6eb39b
```
# 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
```
  haibo.jiang committed May 25, 2020
  2e6eb39b Browse Files
- 增加trackingNo · 487899da
  haibo.jiang committed May 25, 2020
  
  487899da Browse Files
- Merge branch 'feature/1.9.24-fix-mall-20200522-dingkai' into develop · 2117b4fd
  dingkai committed May 25, 2020
  
  2117b4fd Browse Files
- 围餐查询状态 · bfbd1b1e
  dingkai committed May 25, 2020
  
  bfbd1b1e Browse Files
- Merge branch 'feature/1.9.23-错误信息优化-20200513-dingkai' into develop · ae7995c3
```
# Conflicts:
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
```
  dingkai committed May 25, 2020
  ae7995c3 Browse Files
22 May, 2020 4 commits
- 1.5.0.relase · d5be5561
  雷后领 committed May 22, 2020
  
  d5be5561 Browse Files
- 新增配送渠道 · 0f7019f6
  雷后领 committed May 22, 2020
  
  0f7019f6 Browse Files
- 新增配送渠道 · a5526c7b
  雷后领 committed May 22, 2020
  
  a5526c7b Browse Files
- Merge branch 'feature_20200514_1.9.23_discountActiTips' into develop · 2e1ba126
  胡超 committed May 22, 2020
  
  2e1ba126 Browse Files