From 4fde6382570427850cb439fd4a7f401d86be6b63 Mon Sep 17 00:00:00 2001
From: hujiabin <519660157@qq.com>
Date: Mon, 1 Jul 2024 16:10:54 +0800
Subject: [PATCH] 1

---
 webapp/controller/BaseController.class.php  |  5 +++++
 webapp/controller/OtherController.class.php | 16 ++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/webapp/controller/BaseController.class.php b/webapp/controller/BaseController.class.php
index 7eaa72c4..fc9d88a4 100644
--- a/webapp/controller/BaseController.class.php
+++ b/webapp/controller/BaseController.class.php
@@ -59,6 +59,11 @@ class BaseController {
         return phpcommon\getDaySeconds($time, $this->timeZone);
     }
 
+    public function _getDaySecondsOffset($time)
+    {
+        return $time - phpcommon\getDaySeconds($time, $this->timeZone);
+    }
+
     public function _getTodayRemainSeconds()
     {
         return max(0, $this->_getNowDaySeconds() + 3600 * 24 - $this->_getNowTime());
diff --git a/webapp/controller/OtherController.class.php b/webapp/controller/OtherController.class.php
index 79c81f51..f774f8eb 100644
--- a/webapp/controller/OtherController.class.php
+++ b/webapp/controller/OtherController.class.php
@@ -314,12 +314,20 @@ class OtherController extends BaseAuthedController {
                 if ($modeMeta['limit_time'] == 2 && (empty($taskStatus) || !$taskMeta || myself()->_getNowTime() <= strtotime($taskMeta['income_start_time']))){
                     return true;
                 }
-
+                $temp = array(
+                    'id' => $modeMeta['id']
+                );
+                if ($modeMeta['id'] == 1){
+                    $dailyOpenTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ".$modeMeta['daily_open_time']));
+                    $dailyEndTimeOffset = myself()->_getDaySecondsOffset(strtotime("2024-6-22 ".$modeMeta['daily_end_time']));
+                    $nowTimeOffset = myself()->_getDaySecondsOffset(myself()->_getNowTime());
+                    $temp['daily_open_time'] = strtotime($modeMeta['daily_open_time']) ;
+                    $temp['daily_end_time'] = strtotime($modeMeta['daily_end_time']);
+                    $temp['state'] = $nowTimeOffset >= $dailyOpenTimeOffset && $nowTimeOffset <= $dailyEndTimeOffset ? 1 : 0;
+                }
                 array_push(
                     $modeList,
-                    array(
-                        'id' => $modeMeta['id']
-                    )
+                    $temp
                 );
             }
             return true;