From 77fb67e5ef9016d5ddc2bd12b0fe565147d47e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 15 Sep 2025 19:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=A1=E6=97=A0=E5=85=B3=E7=B3=BB=20?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A4=B4=E5=83=8F=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index fc14120..3f45159 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -174,12 +174,6 @@ class Friend extends Model
                 $room_ids = model('api/Room')->user_create_room($user1,'的电影房',get_system_config_value('web_site').'/data/avatar/head_pic.png','交友房产生的一次性房间',7);
                 if($room_ids['code'] != 1){
                     $msg = 'cp电影房创建失败';
-//                    //推送给前端消息
-//                    $text['text'] = '交友结束';
-//                    $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
-//                    model('api/Chat')->sendMsg(1049,$room_id,$text);
-//                    db::rollback();
-//                    return ['code' => 0, 'msg' => 'cp电影房创建失败，请联系管理员','data' => null];
                 }else{
                     //记录小房间
                     $datda = [
@@ -198,20 +192,18 @@ class Friend extends Model
                         $text['text'] = '交友结束并创建房间';
                         $text['relation_name'] = $relation;
                         $text['room_id'] = $room_ids['data'];//前端用来让用户跳转的房间id
-                        $text['user1_id'] = $user1;//进小房间的用户id
-                        $text['user2_id'] = $user2;//进小房间的用户id
-                        $text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar');
-                        $text['user1_nickname'] = db::name('user')->where(['id'=>$user1])->value('nickname');
-                        $text['user2_avatar'] = db::name('user')->where(['id'=>$user2])->value('avatar');
-                        $text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
-                        model('api/Chat')->sendMsg(1051,$room_id,$text);
                     }
                 }
             }else{
                 $text['text'] = '交友结束未创建房间';
-                $text['relation_name'] = $relation;
-                model('api/Chat')->sendMsg(1051,$room_id,$text);
             }
+            $text['user1_id'] = $user1;
+            $text['user2_id'] = $user2;
+            $text['user1_avatar'] = db::name('user')->where(['id'=>$user1])->value('avatar');
+            $text['user1_nickname'] = db::name('user')->where(['id'=>$user1])->value('nickname');
+            $text['user2_avatar'] = db::name('user')->where(['id'=>$user2])->value('avatar');
+            $text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
+            model('api/Chat')->sendMsg(1051,$room_id,$text);
 
             // 修改当前交友阶段
             db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);