Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of…

Merge branches 'feature/20200511_申请退款接口切换_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -465,6 +465,15 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCreateEvent(cancelOrderRequest.getCreateEvent());
         request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
         request.setOperator(cancelOrderRequest.getOperator());
+        //为空发起售后单
+        if(cancelOrderRequest.getCreateEvent() == null){
+            // 查询门店服务配置，退单模式为2为自动退款，判断自动退款时间,设置为0则不传入timeout,
+            StoreResponse.Configuration configuration = getStoreAutoConfiguration(cancelOrderRequest.getPartnerId(), cancelOrderRequest.getStoreId(), cancelOrderRequest.getTrackingNo());
+            if (configuration != null && ObjectUtils.equals("2", configuration.getAutoChargebackOrderType())
+                    && !ObjectUtils.equals("0", configuration.getAutoChargebackOrderTime())) {
+                request.setTimeOut(AutoOrderConfigTime.getTime(configuration.getAutoChargebackOrderTime()));
+            }
+        }
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

@@ -59,4 +59,6 @@ public class OrderCancelReq {
 
     //操作人
     private String operator;
+
+    private Integer timeOut;
 }