MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
赵钊
2025-08-30 10:26:24 +08:00
parent 9b0981bb56 dec58f7ce4
commit cd13eada44
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/api/model/RoomPit.php
View File

@@ -127,7 +127,7 @@ class RoomPit extends Model
return ['code' => 0, 'msg' => '当前房间正在pk中', 'data' => null];
}
$step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step');
if($step && $step != 1 && $pit_number <= 9){
if($step && $step != 1 && $pit_number < 9){
return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];
}
$FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
@@ -907,7 +907,7 @@ class RoomPit extends Model
}
}else{
$step = db::name('vs_room')->where(['id' => $room_id, 'type_id' => 7])->value('step');
if($step && $step != 1){
if($step && $step != 1 && $pit_number != 9){
return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];
}
$where['room_id'] = $room_id;