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

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

@@ -41,6 +41,7 @@ import cn.freemud.service.thirdparty.ShoppingCartClient;
 import cn.freemud.service.thirdparty.StoreBaseApiClient;
 import cn.freemud.service.thirdparty.StoreClient;
 import cn.freemud.utils.AppLogUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformIappWxappConfig;
@@ -65,6 +66,7 @@ import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailRe
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.StoreDeliveryMethod;
+import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import org.apache.commons.collections4.CollectionUtils;
@@ -409,6 +411,9 @@ public class CheckOrder {
      * @param storeResponseDto
      */
     private void checkAdvanceOrderExpectTime(BusinessInfoDto queryBusinessInfoNew,StoreResponse.BizVO storeResponseDto, Date takeMealDateTime) {
+        AssortOrderLogUtil.info("fisherman 校验门店时间数据 01",JSON.toJSONString(queryBusinessInfoNew),
+                JSON.toJSONString(storeResponseDto),
+                JSON.toJSONString(takeMealDateTime));
         if (Objects.isNull(queryBusinessInfoNew)) {
             return;
         }
@@ -418,6 +423,7 @@ public class CheckOrder {
         }
         // fisherman 预计 营业时间范围校验 begin
         List<String> nextDayBusinessTime = storeCenterService.getNextDayBusinessTime(Integer.parseInt(storeResponseDto.getBusinessType()), storeResponseDto.getBusinessHours());
+        AssortOrderLogUtil.info("fisherman 校验门店时间数据 02",JSON.toJSONString(nextDayBusinessTime));
         if (CollectionUtils.isEmpty(nextDayBusinessTime)) {
             throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
         }
@@ -433,6 +439,7 @@ public class CheckOrder {
 
         // 营业结束前校验  结束时间前十分钟可以下单 begin
         List<String> todayBusinessTimes = storeCenterService.getTodayBusinessTime(Integer.parseInt(storeResponseDto.getBusinessType()), storeResponseDto.getBusinessHoursDay());
+        AssortOrderLogUtil.info("fisherman 校验门店时间数据 03",JSON.toJSONString(todayBusinessTimes));
         if (CollectionUtils.isEmpty(todayBusinessTimes)) {
             throw new ServiceException(ResponseResult.STORE_BUSINESS_HOUR_ERROR);
         }