Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of…

Merge branches 'develop' and 'feature/20200303_预约单2_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -1334,7 +1334,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         if (configuration != null) {
             //外卖单
             if (OrderType.GENERAL_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())) {
-                if (baseQueryOrderRequest.isHasSelfDelivery() && org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
+                if (StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime());
                 }
                 //预约单
@@ -1343,7 +1343,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAppointAutoTakeOutTakeOrderWorkflowFinishTime());
                 }
             } else {//自提单
-                if (org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
+                if (StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
                     timeout = AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime());
                 }
                 //预约单
@@ -1361,8 +1361,6 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 orderTask.setTaskTime(baseQueryOrderRequest.getExpectTime());
 //                orderTask.setTimeout(0);
                 request.setOrderTask(orderTask);
-                //设置超时变制作完成或配送中时间为0
-                timeout = 0;
             }
         } else {
             timeout = 120;