From 671f258d7a77b5319218a2dcc248493dc80372a5 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 21 Aug 2024 16:01:38 +0800
Subject: [PATCH] 1

---
 webapp/mt/MapMode.php | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/webapp/mt/MapMode.php b/webapp/mt/MapMode.php
index a0e17dd8..e8f3f5a4 100644
--- a/webapp/mt/MapMode.php
+++ b/webapp/mt/MapMode.php
@@ -37,13 +37,19 @@ class MapMode
 
     public static function checkLimitTime($meta)
     {
-        if (!empty($meta['daily_open_time']) && !empty($meta['daily_end_time'])) {
-            if (myself()->_inTimeRangeStr($meta['daily_open_time'], $meta['daily_end_time'])) {
-                return false;
+        if (self::configedDailyTimeLimit1($meta) || self::configedDailyTimeLimit2($meta)) {
+            $matchTimes = 0;
+            if (self::configedDailyTimeLimit1($meta)) {
+                if (myself()->_inTimeRangeStr($meta['daily_open_time'], $meta['daily_end_time'])) {
+                    ++$matchTimes;
+                }
             }
-        }
-        if (!empty($meta['daily_open_time2']) && !empty($meta['daily_end_time2'])) {
-            if (myself()->_inTimeRangeStr($meta['daily_open_time2'], $meta['daily_end_time2'])) {
+            if (self::configedDailyTimeLimit2($meta)) {
+                if (myself()->_inTimeRangeStr($meta['daily_open_time2'], $meta['daily_end_time2'])) {
+                    ++$matchTimes;
+                }
+            }
+            if ($matchTimes <= 0) {
                 return false;
             }
         }
@@ -108,6 +114,14 @@ class MapMode
         return $isOpen;
     }
 
+    public static function configedDailyTimeLimit1($meta) {
+        return !empty($meta['daily_open_time']) && !empty($meta['daily_end_time']);
+    }
+
+    public static function configedDailyTimeLimit2($meta) {
+        return !empty($meta['daily_open_time2']) && !empty($meta['daily_end_time2']);
+    }
+
     protected static function getMetaList()
     {
         if (!self::$metaList) {