Merge branch 'develop' of gitlab.freemud.com:order-group-application/order-group into develop

order-management/src/main/java/cn/freemud/management/enums/ResponseResult.java

@@ -173,8 +173,8 @@ public enum ResponseResult {
     AGREE_REFUND_APPLY_ORDER_NOT_ALLOW("45088", "商户配置不允许退款，请检查商户配置"),
     PARTNER_ORDER_CANCEL_ERROR("45089", "取消订单失败"),
     ORDER_DELIVERY_EDIT_FAILED("45090", "修改配送状态失败"),
-
     PARTNER_CAN_NOT_CANCEL_ORDER("45091","订单已部分退款，不能取消"),
+    DONE_FAIL_ONE_MINUTE("45092", "平台规定，接单一分钟后才能出餐"),
 
     /**
      * 支付

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -33,11 +33,11 @@ import org.springframework.stereotype.Component;
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
-//import cn.freemud.base.log.LogTreadLocal;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -149,6 +149,12 @@ public class OrderVerifyHandle {
         if (this.checkSaasWm(orderBean) && this.verifyThirdFlow(orderBean,request)) {
             return ResponseUtil.error(ResponseResult.ORDER_MOVE_FAILED);
         }
+        //美团规定，一分钟内不能出餐
+        if (Objects.equals(OrderClientType.MEITUAN.getIndex().toString(), orderBean.getOrderClient()) && orderBean.getGmtAccept() != null) {
+            if (orderBean.getGmtAccept() - new Date().getTime() < 60 * 1000) {
+                return ResponseUtil.error(ResponseResult.DONE_FAIL_ONE_MINUTE);
+            }
+        }
         return ResponseUtil.success();
     }