Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into qa

order-application-service/src/main/java/cn/freemud/service/adapter/OrderCheckAdapter.java

@@ -39,7 +39,8 @@ public class OrderCheckAdapter {
             return;
         }
         // 预定单 不校验 下面的预约单
-        if (BizTypeEnum.ADVANCE_ORDER.getBizType().compareTo(vo.getBizType()) == 0) {
+        if (Objects.nonNull(vo.getBizType())
+                && BizTypeEnum.ADVANCE_ORDER.getBizType().compareTo(vo.getBizType()) == 0) {
             return;
         }
         StoreResponse.Configuration configuration = storeResponse.getBizVO().getStoreConfig();

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

@@ -1031,7 +1031,8 @@ public class CheckOrder {
             userDeliveryInfoDto.getStoreDeliveryInfoDto().setDeliveryType(s);
 
             // 【ID1030916】订单查询门店获取预计送达时间 并且不是预约单
-            if (StringUtils.isEmpty(createOrderVo.getExpectTime())) {
+            if (StringUtils.isEmpty(createOrderVo.getExpectTime())
+                    && !this.getIsAdvanceOrder(createOrderVo.getBizType())) {
                 userDeliveryInfoDto.setEstimateDeliveryCompleteTime(getEstimateDeliveryCompleteTime(receiveAddressResult.getLatitude(), receiveAddressResult.getLongitude(), storeDeliveryInfoDto.getPartnerId(), storeDeliveryInfoDto.getStoreId()));
             }
         }