From 3e298026d9fa64389674c54784fb3e7633d99e9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 29 Aug 2025 16:45:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=88=BF=E5=8D=A1?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=20=20=E5=8D=A1=E5=85=B3=E7=B3=BB=20=E2=80=9C?= =?UTF-8?q?=E6=97=A0=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Friend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]; } From 4ba52435a6de2af50739abb16adab5acce6ce639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 29 Aug 2025 16:53:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E6=88=BF=E4=B8=8A?= =?UTF-8?q?=E9=BA=A6=20=20=E4=B8=BB=E6=8C=81=E4=B8=8D=E5=8F=97=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/RoomPit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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]; }