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

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

@@ -423,12 +423,12 @@ 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);
         }
         for (String bussinessTime : nextDayBusinessTime) {
             BusinessDate bussinessTime2 = this.getStoreBusinessDate(bussinessTime, true);
+            AssortOrderLogUtil.info("fisherman 校验门店时间数据 02",JSON.toJSONString(bussinessTime2));
             // 取餐时间在营业时间前面, 或者在营业结束时间后面
             boolean isTrue = takeMealDateTime.before(bussinessTime2.getStartDate()) || takeMealDateTime.after(bussinessTime2.getEndDate());
             if (isTrue) {
@@ -439,7 +439,6 @@ 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);
         }
@@ -448,6 +447,7 @@ public class CheckOrder {
         for (String todayTime : todayBusinessTimes) {
             //每段营业时间校验
             BusinessDate businessDate2 = this.getStoreBusinessDate(todayTime, true);
+            AssortOrderLogUtil.info("fisherman 校验门店时间数据 03",JSON.toJSONString(businessDate2));
             if (createOrder.after(businessDate2.getEndDate())) {
                 throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD);
             }