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