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

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

@@ -427,10 +427,10 @@ public class CheckOrder {
         }
         for (String bussinessTime : nextDayBusinessTime) {
             BusinessDate bussinessTime2 = this.getStoreBusinessDate(bussinessTime, true);
-            AppLogUtil.infoLog("fisherman 校验门店时间数据 02", JSON.toJSONString(bussinessTime2),null);
+            AppLogUtil.infoLog("fisherman 校验门店时间数据 02", JSON.toJSONString(bussinessTime2),takeMealDateTime);
             // 取餐时间在营业时间前面, 或者在营业结束时间后面
-            boolean isTrue = takeMealDateTime.before(bussinessTime2.getStartDate()) || takeMealDateTime.after(bussinessTime2.getEndDate());
-            if (isTrue) {
+            boolean isTrue = takeMealDateTime.after(bussinessTime2.getStartDate()) && takeMealDateTime.before(bussinessTime2.getEndDate());
+            if (!isTrue) {
                 throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD);
             }
         }