创建配送单预约时间错误修改时间，超时自动接单调整

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

@@ -240,20 +240,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setPayRequestNo(confirmOrderRequest.getPayVoucher());
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
-        Integer timeout = getPaySuccessTimeout(confirmOrderRequest);
-        // 引入门店基础服务 查询自动制作完成配置时间
-        request.setTimeout(timeout);
-        //设置预约单支付成功超时任务
-        if(StringUtils.isNotBlank(confirmOrderRequest.getExpectTime())  && timeout != 0){
-            OrderTaskReq orderTask = new OrderTaskReq();
-            orderTask.setTaskType(2);
-            orderTask.setProcessingTime(confirmOrderRequest.getExpectTime());
-            Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(confirmOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
-            orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
-            orderTask.setTimeout(timeout);
-            request.setTimeout(0);
-            request.setOrderTask(orderTask);
-        }
+        // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
+        request.setTimeout(getPaySuccessTimeout(confirmOrderRequest,request));
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
@@ -407,7 +395,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
      * @param confirmOrderRequest
      * @return
      */
-    private Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest){
+    private Integer getPaySuccessTimeout(ConfirmOrderRequest confirmOrderRequest,PaySuccessReq request){
         Integer timeout = 0;
         StoreInfoRequest storeInfoRequest = new StoreInfoRequest();
         storeInfoRequest.setPartnerId(confirmOrderRequest.getPartnerId());
@@ -420,9 +408,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
                 timeout = 30;
             }
             //超时关单开启
-            if(configuration != null && org.apache.commons.lang.StringUtils.isNotBlank(configuration.getOverTimeCloseOrder())){
+            if(configuration != null  && ObjectUtils.equals("1", configuration.getOverTimeCloseOrder())
+                    && StringUtils.isNotBlank(configuration.getOverTimeCloseOrderTime())){
                 timeout =  Integer.parseInt(configuration.getOverTimeCloseOrderTime());
             }
+            //设置预约单支付成功超时任务
+            if(StringUtils.isNotBlank(confirmOrderRequest.getExpectTime())  && timeout != 0){
+                OrderTaskReq orderTask = new OrderTaskReq();
+                orderTask.setTaskType(2);
+                orderTask.setProcessingTime(confirmOrderRequest.getExpectTime());
+                Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(confirmOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), timeout);
+                orderTask.setTaskTime(DateUtil.convert2String(processingDate,DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+                orderTask.setTimeout(timeout);
+                request.setOrderTask(orderTask);
+                //设置超时拒单时间为0
+                timeout = 0;
+            }
             //isAutoTakeOrder = 3为服务端超时接单
             if("3".equals(storeResponse.getBizVO().getIsAutoTakeOrder())){
                 //外卖订单

order-management/src/main/java/cn/freemud/management/service/OrderDeliveryService.java

@@ -169,7 +169,7 @@ public class OrderDeliveryService {
         deliveryOrderRequestDto.setOrderTime(new Date(order.getGmtCreate()));
         deliveryOrderRequestDto.setCallbackUrl(deliveryCallBackUrl);
         // 预约单预计送到时间
-        deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtCreate()));
+        deliveryOrderRequestDto.setExpectTime(new Date(order.getGmtExpect()));
         deliveryOrderRequestDto.setIsPre(order.getGmtExpect() != null ? 1 : 0);
         List<CreateDeliveryOrderRequestDto.DeliveryProductInfo> productInfos = new ArrayList<>();
         order.getProductList().forEach(productList -> {