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

This commit is contained in:
2025-09-03 21:27:28 +08:00

View File

@@ -818,10 +818,19 @@ class RoomPit extends Model
}
if($type == 1){//抱麦
$on_9_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => 9])->value('user_id');
if($on_9_pit <= 0){
return ['code' => 0, 'msg' => '您暂未上主持麦位,请先上麦', 'data' => null];
if($pit_number == 10){
$on_9_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => 9])->value('user_id');
if($on_9_pit != $user_id){
return ['code' => 0, 'msg' => '请等待麦上主持抱麦', 'data' => null];
}
}
//房主
$owner = db::name('vs_room')->where(['id' => $room_id, 'user_id' => $user_id])->field('id')->find();
$host = db::name('vs_room_host')->where(['room_id' => $room_id, 'user_id' => $user_id,'delete_time' => null])->find();
if(!$owner && !$host){
return ['code' => 0, 'msg' => '没有权限操作', 'data' => null];
}
if(!$pit_number){
$room_type = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
if($room_type == 2){