Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into develop

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml

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

@@ -81,6 +81,7 @@ import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -375,7 +376,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
         request.setCompleteOrderCode(confirmOrderRequest.getCompleteOrderCode());
         request.setOrderCode(confirmOrderRequest.getOrderId());
         // 引入门店基础服务 查询自动制作完成配置时间，预约单单独超时任务设置
-        request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        if(confirmOrderRequest.getTimeout() == null || confirmOrderRequest.getTimeout() == 0) {
+            request.setTimeout(getMCCafePaySuccessTimeout(confirmOrderRequest,request));
+        } else {
+            request.setTimeout(confirmOrderRequest.getTimeout());
+        }
 
         if (!org.springframework.util.CollectionUtils.isEmpty(confirmOrderRequest.getOrderSettlements())) {
             List<OrderSettlementCreateReq> orderSettlementCreateReqs = new ArrayList<>();
@@ -576,7 +581,13 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             Random r = new Random();
             int minute = r.ints(1,31).findFirst().getAsInt() * 60000;
             String today = DateUtil.getCurrentDate(DateUtil.FORMAT_YMD);
+
             Date configTime = DateUtil.convert2Date(today+" "+timeOfRefund, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            // 判断当前时间是否已经超过门店设置的截至时间
+            if(new Date().after(configTime)){
+                today = DateUtil.convert2String(DateUtil.addDays(new Date(),1),DateUtil.FORMAT_YMD);
+                configTime = DateUtil.convert2Date(today+" "+timeOfRefund, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
+            }
             Date processingDate = new Date(configTime.getTime() + minute);
             String processingStr = DateUtil.convert2String(processingDate, DateUtil.FORMAT_YYYY_MM_DD_HHMMSS);
             orderTask.setTaskTime(processingStr);

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -868,6 +868,9 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         }
         if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
             var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
+            if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getType())) {
+                var1.setTimeout(-5);
+            }
         }
         // 订单支付成功
         com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccessMCCafe(var1);