From 0dca064fe847ef455f8e6705a8d13b42f21dbb5c 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:45:02 +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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/api/model/Room.php b/application/api/model/Room.php index a017bc9..f56be3e 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -2020,6 +2020,7 @@ class Room extends Model db::rollback(); return ['code' => 0, 'msg' => '修改失败', 'data' => null]; } + //如果房间正在点唱中,结束点唱 $romm_song = db::name('vs_room_song')->where(['room_id' => $room_id])->order('did desc')->find(); if(isset($romm_song) && ($romm_song['status'] == 1 || $romm_song['status'] == 2)){ @@ -2029,7 +2030,6 @@ class Room extends Model } } - db::name('vs_room_pit_simulate')->where(['room_id' => $room_id])->delete(); //申请上麦的全部下麦 model('RoomPit')->clear_apply_pit_list($uid, $room_id);