Merge remote-tracking branch 'remotes/origin/feature/20201022-refundReform-刘鹏飞' into qa

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

@@ -547,7 +547,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
      */
     private OrderTaskReq setAfterSalesOrderTimeOutTask(StoreResponse.Configuration configuration) {
 
-        if(configuration != null && 2 == configuration.getTimeTypeOfRefund().intValue()){// 48小时之后
+        if(configuration != null && (configuration.getTimeTypeOfRefund() != null && 2 == configuration.getTimeTypeOfRefund().intValue()) || configuration.getTimeTypeOfRefund() == null){// 48小时之后
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);
@@ -561,7 +561,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             orderTask.setProcessingTime(DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
 
             return orderTask;
-        }else if(configuration != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
+        }else if(configuration != null && configuration.getTimeTypeOfRefund() != null && 1 == configuration.getTimeTypeOfRefund().intValue()){// 指定时间
             OrderTaskReq orderTask = new OrderTaskReq();
             orderTask.setTaskType(4);
             orderTask.setTimeout(1);