From 384f631cd62fef472f6b2f40094b8ef21e4e747e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 5 Dec 2025 15:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=94=B1=E8=BD=AC=E6=8D=A2=E7=AD=BE?=
 =?UTF-8?q?=E7=BA=A6=E4=B8=8B=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 35 ++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 3e4aba4..a017bc9 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1952,6 +1952,24 @@ class Room extends Model
 
         //开启事务
         db::startTrans();
+
+        //在麦位上的用户 全部下麦
+        $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'status' => 1,'user_id'=>['>',0],'pit_number' => ['<',9]])->select();
+        if($on_pit){
+            foreach ($on_pit as $v){
+                model('RoomPit')->DownPit($v['user_id'], $room_id,$v['pit_number']);
+            }
+        }
+
+        //转到type= 10 签约房 嘉宾麦有人也下麦
+        if($type == 10){
+            $jiabin = db::name('vs_room_pit')->where(['room_id' => $room_id,'pit_number' => 10])->value('user_id');
+            if($jiabin){
+                model('RoomPit')->DownPit($jiabin, $room_id,10);
+            }
+        }
+
+
         $data = [];
         //1-交友，3、4、8-不要了
         if($type == 1 || $type == 3 || $type == 4 || $type == 8){
@@ -2010,22 +2028,7 @@ class Room extends Model
                 db::name('vs_room_song')->where('room_id',$room_id)->update(['times_status'=>2]);
             }
         }
-        //在麦位上的用户 全部下麦
-        $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id,'status' => 1,'user_id'=>['>',0],'pit_number' => ['<',9]])->select();
-        if($on_pit){
-            foreach ($on_pit as $v){
-                model('RoomPit')->DownPit($v['user_id'], $room_id,$v['pit_number']);
-            }
-        }
-        //转到type= 10 签约房 嘉宾麦有人也下麦
-        if($type == 10){
-            $jiabin = db::name('vs_room_pit')->where(['room_id' => $room_id,'pit_number' => ['<>',9]])->field('pit_number,user_id')->select();
-            if($jiabin){
-                foreach ($jiabin as $v){
-                    model('RoomPit')->DownPit($v['user_id'], $room_id,$v['pit_number']);
-                }
-            }
-        }
+
 
         db::name('vs_room_pit_simulate')->where(['room_id' => $room_id])->delete();
         //申请上麦的全部下麦