diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php index e83a129..0b1c5a8 100644 --- a/application/api/model/Friend.php +++ b/application/api/model/Friend.php @@ -143,7 +143,7 @@ class Friend extends Model //心动值超过配置值 创建关系 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]; } diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index 964dfbe..0e8bc52 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -192,7 +192,7 @@ class RoomPit extends Model 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]; }