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-29 17:00:30 +08:00
parent 4fae9e86b7 4ba52435a6
commit 5b5e9596fb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/model/Friend.php
View File

@@ -143,7 +143,7 @@ class Friend extends Model
//心动值超过配置值 创建关系 //心动值超过配置值 创建关系
public function createRelation($user_id,$room_id,$friend_id,$user1_id,$user2_id,$friending_config_id){ public function createRelation($user_id,$room_id,$friend_id,$user1_id,$user2_id,$friending_config_id){
if (!$user1_id || !$user2_id || !$friend_id || !$friending_config_id || !$room_id || !$user_id) { if (!$user1_id || !$user2_id || !$friend_id || !$room_id || !$user_id) {
return ['code' => 0, 'msg' => '参数有误！', 'data' => null]; return ['code' => 0, 'msg' => '参数有误！', 'data' => null];
} }

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

@@ -192,7 +192,7 @@ class RoomPit extends Model
return ['code' => 0, 'msg' => '您已上麦', 'data' => null]; return ['code' => 0, 'msg' => '您已上麦', 'data' => null];
} }
if($room_info['label_id'] == 5 && $room_info['step'] != 1){ if($room_info['label_id'] == 5 && $room_info['step'] != 1 && $pit_number < 9){
return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null]; return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];
} }