Commits · 147438fd97e931c0ece02c044745bfeda84aa0cd · order-group-application / order-group

18 May, 2020 23 commits
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · 147438fd
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  147438fd Browse Files
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · cf6905d2
  haibo.jiang committed May 18, 2020
  
  cf6905d2 Browse Files
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · e6765445
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  e6765445 Browse Files
- Merge branch 'feature-2020/5/18-1.9.23-下单增加支付方式-海波' into develop · 2d8a47dd
```
# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
```
  haibo.jiang committed May 18, 2020
  2d8a47dd Browse Files
- Merge branch 'feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into develop · 93f3ab81
  haibo.jiang committed May 18, 2020
  
  93f3ab81 Browse Files
- fix:refundTips · 05ab6404
  xiaoer.li committed May 18, 2020
  
  05ab6404 Browse Files
- Merge branch 'feature/20200518_退款退配送费' into develop · b7cead5c
  shuhu.hou@freemud.cn committed May 18, 2020
  
  b7cead5c Browse Files
- 退款退配送费 · b3dcf124
  shuhu.hou@freemud.cn committed May 18, 2020
  
  b3dcf124 Browse Files
- 增加订单支付类型 · 9addf12b
  haibo.jiang committed May 18, 2020
  
  9addf12b Browse Files
- 退款退配送费 · 3f7a447a
  shuhu.hou@freemud.cn committed May 18, 2020
  
  3f7a447a Browse Files
- 新增根据订单号查询售后单 · 74812fe4
  shuhu.hou@freemud.cn committed May 18, 2020
  
  74812fe4 Browse Files
- Merge branch 'feature/20200518_退款退配送费' into develop · 45ee75b2
```
# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
```
  shuhu.hou@freemud.cn committed May 18, 2020
  45ee75b2 Browse Files
- 新增根据订单号查询售后单 · 87b38f4a
  shuhu.hou@freemud.cn committed May 18, 2020
  
  87b38f4a Browse Files
- 同步升级聚合订单sdk · 71b5b7b0
  ping.wu committed May 18, 2020
  
  71b5b7b0 Browse Files
- Merge remote-tracking branch 'origin/develop' into develop · c072d3fa
  ping.wu committed May 18, 2020
  
  c072d3fa Browse Files
- Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of… · 9f32c4bf
```
Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-management/src/main/java/cn/freemud/management/service/handle/SaasOrderHandle.java
```
  ping.wu committed May 18, 2020
  9f32c4bf Browse Files
- Merge branch 'feature/1.9.22-蜜雪预支付-20200430-dingkai' into develop · 265e3e32
  dingkai committed May 18, 2020
  
  265e3e32 Browse Files
- 预约单接单后提醒时间区分外卖自提 · 290a5919
  ping.wu committed May 18, 2020
  
  290a5919 Browse Files
- 对接门店设置自提、外卖提醒时间 · 62c9b810
  ping.wu committed May 18, 2020
  
  62c9b810 Browse Files
- 序号修复 · 27a4df19
  dingkai committed May 18, 2020
  
  27a4df19 Browse Files
- 增加日志 · dba83524
  haibo.jiang committed May 18, 2020
  
  dba83524 Browse Files
- 退单增加配送费逻辑 · 0bd2275d
  haibo.jiang committed May 18, 2020
  
  0bd2275d Browse Files
- Merge remote-tracking branch 'remotes/origin/feature/1.9.22_C端订单状态描述' · fd61cca6
  xiaoer.li committed May 18, 2020
  
  fd61cca6 Browse Files
15 May, 2020 17 commits
- Merge branch 'feature/20200513_爱马哥兼容' into develop · b5c25a39
  shuhu.hou@freemud.cn committed May 15, 2020
  
  b5c25a39 Browse Files
- 爱马哥非外卖单调用送出，直接完成订单 · e79257c9
  shuhu.hou@freemud.cn committed May 15, 2020
  
  e79257c9 Browse Files
- 商家会处理退款申请，请稍后 · a98771cd
  xiaoer.li committed May 15, 2020
  
  a98771cd Browse Files
- 商家会处理退款申请，请稍后 · 60410235
  xiaoer.li committed May 15, 2020
  
  60410235 Browse Files
- 正在退款中，稍后金额会原路退回退款状态 · a658d016
  xiaoer.li committed May 15, 2020
  
  a658d016 Browse Files
- Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of… · ca51ce9f
```
Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md
```
  ping.wu committed May 15, 2020
  ca51ce9f Browse Files
- 聚合订单sdk综合查询接口新增新订单类型集合 · 46792019
  ping.wu committed May 15, 2020
  
  46792019 Browse Files
- 新增配送渠道 · 4c9144a0
  雷后领 committed May 15, 2020
  
  4c9144a0 Browse Files
- 新增配送渠道 · 36b5642b
  雷后领 committed May 15, 2020
  
  36b5642b Browse Files
- 新增配送渠道 · ef63c0d8
  雷后领 committed May 15, 2020
  
  ef63c0d8 Browse Files
- 删除订单创建时间和完成时间 · 27498bf2
  雷后领 committed May 15, 2020
  
  27498bf2 Browse Files
- 订单创建时间和完成时间 · 6c54cdb0
  雷后领 committed May 15, 2020
  
  6c54cdb0 Browse Files
- 订单完成时间 · 32d33557
  雷后领 committed May 15, 2020
  
  32d33557 Browse Files
- 配送渠道新增 · cadee63e
  雷后领 committed May 15, 2020
  
  cadee63e Browse Files
- Merge branch 'feature_20200514_1.9.23_discountActiTips' into develop · c82fce0a
  胡超 committed May 15, 2020
  
  c82fce0a Browse Files
- 显示完整的满减活动提示 · 6f6c9fc7
  胡超 committed May 15, 2020
  
  6f6c9fc7 Browse Files
- 退款中的订单提示统一改成正在退款中，请稍等 · 9bda6fe5
  xiaoer.li@freemud.com committed May 15, 2020
  
  9bda6fe5 Browse Files