From 769710c2dc7c4c9b982b6cf7db70390aa364015b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 13 Oct 2025 19:11:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?cp=E6=88=BF=E9=97=B4=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=20=E7=AE=A1=E7=90=86=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Room.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/adminapi/controller/Room.php b/application/adminapi/controller/Room.php
index 5e5061b..edf9c5a 100644
--- a/application/adminapi/controller/Room.php
+++ b/application/adminapi/controller/Room.php
@@ -1010,11 +1010,13 @@ class Room extends adminApi
         // 检查并转换时间格式为时间戳
         if(!empty($start_time)){
             $start_time = strtotime($start_time);
+            $where['createtime'] = ['>=', $start_time];
         }else{
             $start_time = 0;
         }
         if(!empty($end_time)){
             $end_time = strtotime($end_time);
+            $where['createtime'] = ['<=', $end_time];
         }else{
             $end_time = time();
         }

From 69e5922901c234b0378c3b4c505b86d0409c7177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 13 Oct 2025 19:47:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B8=A2=E5=87=BA=E6=88=BF=E9=97=B4=205?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=20=E6=94=B910=E5=88=86=E9=92=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index ed0128f..218b0af 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1157,7 +1157,7 @@ class Room extends Model
             }else{
                 $room_typer = '管理员';
             }
-            db::name('vs_room_black')->insert(['room_id' => $room_id, 'user_id' => $uid,'black_id' => $user_id,'type' => 1,'kick_time' => time()+300,'createtime' => time()]);
+            db::name('vs_room_black')->insert(['room_id' => $room_id, 'user_id' => $uid,'black_id' => $user_id,'type' => 1,'kick_time' => time()+600,'createtime' => time()]);
             //发送消息
 
             $text['text'] = '用户 ' . $nickname . ' 被 '. $room_typer .' 踢出房间';

From aa8f10e4f66220fbaa1f11ab9895e9a9c3182636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 13 Oct 2025 19:58:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E6=97=B6=E6=A6=9C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomHourRanking.php | 25 +++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/application/api/model/RoomHourRanking.php b/application/api/model/RoomHourRanking.php
index b5f0438..f7acd49 100644
--- a/application/api/model/RoomHourRanking.php
+++ b/application/api/model/RoomHourRanking.php
@@ -32,12 +32,29 @@ class RoomHourRanking extends Model
 //        $is_open_red_pack = db::name('vs_hour_ranking_config')->where('id', 1)->value('is_open_red_pack');
         $is_open_red_pack = 0 ;
 
+//        $profit = db::name('vs_room')->alias('a')
+//            ->join('vs_give_gift b', 'a.id = b.from_id AND b.from = 2 AND b.createtime BETWEEN '.$start_time.' AND '.$end_time, 'left')
+//            ->join('vs_room_label c', 'a.label_id = c.id','left')
+//            ->field('a.id as room_id,a.user_id,a.room_name,a.label_id,a.room_cover,IFNULL(sum(b.total_price), 0) as total_price,c.label_icon')
+//            ->where('a.room_status', 1)  // 只统计正常状态的房间
+//            ->where('a.apply_status', 2) // 只统计审核通过的房间
+//            ->where('a.type_id', '<>', 6)
+//            ->group('a.id')
+//            ->order('total_price', 'desc')
+//            ->page($page, $page_limit)
+//            ->select();
+        // 更进一步的优化版本：
+        $subQuery = Db::name('vs_give_gift')
+            ->where('from', 2)
+            ->whereBetween('createtime', [$start_time, $end_time])
+            ->buildSql();
+
         $profit = db::name('vs_room')->alias('a')
-            ->join('vs_give_gift b', 'a.id = b.from_id AND b.from = 2 AND b.createtime BETWEEN '.$start_time.' AND '.$end_time, 'left')
+            ->join([$subQuery => 'b'], 'a.id = b.from_id', 'left')
             ->join('vs_room_label c', 'a.label_id = c.id','left')
-            ->field('a.id as room_id,a.user_id,a.room_name,a.label_id,a.room_cover,IFNULL(sum(b.total_price), 0) as total_price,c.label_icon')
-            ->where('a.room_status', 1)  // 只统计正常状态的房间
-            ->where('a.apply_status', 2) // 只统计审核通过的房间
+            ->field('a.id as room_id,a.user_id,a.room_name,a.label_id,a.room_cover,IFNULL(SUM(b.total_price), 0) as total_price,c.label_icon')
+            ->where('a.room_status', 1)
+            ->where('a.apply_status', 2)
             ->where('a.type_id', '<>', 6)
             ->group('a.id')
             ->order('total_price', 'desc')