From 61773a13b498aad409096155263cdff788b5aed7 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Mon, 21 Jul 2025 08:29:14 +0800
Subject: [PATCH] fix: resolve issue where dynamic rate cannot be disabled

---
 app/Models/Server.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/Models/Server.php b/app/Models/Server.php
index 718432f..dcbaf44 100644
--- a/app/Models/Server.php
+++ b/app/Models/Server.php
@@ -28,6 +28,7 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
  * @property string|null $network 网络类型
  * @property int|null $parent_id 父节点ID
  * @property float|null $rate 倍率
+ * @property boolean $rate_time_enable 是否启用时间范围功能
  * @property array|null $rate_time_ranges 倍率时间范围
  * @property int|null $sort 排序
  * @property array|null $protocol_settings 协议设置
@@ -455,13 +456,15 @@ class Server extends Model
 
     public function getCurrentRate(): float
     {
-        $now = date('H:i');
-        $ranges = $this->rate_time_ranges ?? [];
-        foreach ($ranges as $range) {
-            if ($now >= $range['start'] && $now <= $range['end']) {
-                return (float) $range['rate'];
-            }
+        if (!$this->rate_time_enable) {
+            return (float) $this->rate;
         }
-        return (float) $this->rate;
+
+        $now = now()->format('H:i');
+        $ranges = $this->rate_time_ranges ?? [];
+        $matchedRange = collect($ranges)
+            ->first(fn($range) => $now >= $range['start'] && $now <= $range['end']);
+        
+        return $matchedRange ? (float) $matchedRange['rate'] : (float) $this->rate;
     }
 }