Merge branch '20210107-修复外卖隔日预约单无法下单问题-zhiwei.zha'

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

@@ -543,7 +543,7 @@ public class CheckOrder {
         Date newDate = DateUtil.convert2Date(date, DateUtil.FORMAT_yyyyMMdd_date);
         newDate = DateUtil.addDays(newDate, 1);
         //隔天预约(在明日凌晨之后且在门店营业结束之后)
-        if (takeMealDateTime.after(todayEndDate) && takeMealDateTime.after(newDate)) {
+        if (takeMealDateTime.before(todayEndDate) && takeMealDateTime.after(newDate)) {
             expectTimeInTodayBusinessTime = false;
         }
         if (expectTimeInTodayBusinessTime) {
@@ -592,9 +592,6 @@ public class CheckOrder {
      * @param expectTimeInTodayBusinessTime 是否在当日营业时间内
      */
     private void checkTakeOutTime(StoreResponseDto storeResponseDto, Date now, Date takeMealDateTime, boolean expectTimeInTodayBusinessTime) {
-        //todo 这里紧急先处理太古坊宴会甜品定制2807商户无法下隔日预约单问题，先不校验能下单，后续修复后再去除
-        if ("2807".equals(storeResponseDto.getPartnerId())) return;
-
         String deliveryStr = storeResponseDto.getDeliveryHoursDay().replace("-", ",")
                 .replace("_", ",");
         String[] deliverys = deliveryStr.split(",");