Merge remote-tracking branch 'origin/develop' into develop

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();
         }

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 .' 踢出房间';

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')