From f67acd08668c012260d1f0c6897f442172efed62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 11 Dec 2025 18:47:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B8=88=E5=BE=92?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=BF=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 49 ++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index e3841385..8359a381 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -3325,15 +3325,15 @@ class Room extends Model
             if(!$room_ids){
                 return 0;
             }
-
-            //获取徒弟是否在房间内
-            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
-            if($roomId){
-                //在上面获取 一个随义的id
-                return $room_ids[array_rand($room_ids)];
-            }else{
-                return 0;
-            }
+            //在上面获取 一个随义的id
+            return $room_ids[array_rand($room_ids)];
+//            //获取徒弟是否在房间内
+//            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
+//            if($roomId){
+//
+//            }else{
+//                return 0;
+//            }
 
         }
         if($task_id == 22){
@@ -3344,14 +3344,15 @@ class Room extends Model
             if(!$room_ids){
                 return 0;
             }
+            //在上面获取 一个随义的id
+            return $room_ids[array_rand($room_ids)];
             //获取徒弟是否在房间内
-            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
-            if($roomId){
-                //在上面获取 一个随义的id
-                return $room_ids[array_rand($room_ids)];
-            }else{
-                return 0;
-            }
+//            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
+//            if($roomId){
+//
+//            }else{
+//                return 0;
+//            }
         }
         if($task_id == 23){
             //拍卖  且有人有热度
@@ -3361,14 +3362,16 @@ class Room extends Model
             if(!$room_ids){
                 return 0;
             }
+
+            //在上面获取 一个随义的id
+            return $room_ids[array_rand($room_ids)];
             //获取徒弟是否在房间内
-            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
-            if($roomId){
-                //在上面获取 一个随义的id
-                return $room_ids[array_rand($room_ids)];
-            }else{
-                return 0;
-            }
+//            $roomId = db::name('vs_room_visitor')->where('user_id',$user_id)->order('id desc')->value('room_id');
+//            if($roomId){
+//
+//            }else{
+//                return 0;
+//            }
         }
         if(in_array($task_id, [7,8,13,14,18,19,20])){
             //抽奖

From a2383add232e830b894f1ddd24893de175814039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 11 Dec 2025 18:57:17 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=B8=88=E5=BE=92?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=88=BF=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 8359a381..fca933cd 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -3337,7 +3337,7 @@ class Room extends Model
 
         }
         if($task_id == 22){
-            //拍卖  且有人有热度
+            //点歌  且有人有热度
             $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
                 ->where(['a.type_id' => 9,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]])
                 ->column('a.id');
@@ -3355,7 +3355,7 @@ class Room extends Model
 //            }
         }
         if($task_id == 23){
-            //拍卖  且有人有热度
+            //互娱 且有人有热度
             $room_ids = db::name('vs_room')->alias('a')->join('vs_room_visitor b','a.id = b.room_id','right')
                 ->where(['a.type_id' => 7,'a.room_status' => 1,'a.today_hot_value' => ['>',0],'b.user_id' => ['<>',0]])
                 ->column('a.id');