From 632527da5c5a4be466fa6bd0c34015bb4a47fe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 3 Jan 2026 10:55:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E7=BB=93=E6=9D=9F=20?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 26 ++++++++++++++++++--------
 application/api/model/Room.php   |  2 +-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index b8329d87..580d71fe 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -113,7 +113,8 @@ class Friend extends Model
             $return['user2_nickname'] = db::name('user')->where(['id'=>$originalPairs['user2_id']])->value('nickname');
             $return['heart_value'] = $originalPairs['heart_value'];
             $return['heart_id'] = $originalPairs['id'];
-            $room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
+//            $room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
+            $room_updatatime = db::name('vs_user_friending')->where(['id' => $id])->value('update_time');
             if($room_updatatime){ //180秒内没操作 则创建关系无(元旦 泽喜 说的）
                 if(time() - $room_updatatime > 180){
                     $this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
@@ -139,7 +140,7 @@ class Friend extends Model
 
         //结束交友游戏
         if($step == 1){
-            db::name('vs_user_friending')->where(['id' => $id])->update(['status' => 2]);
+            db::name('vs_user_friending')->where(['id' => $id])->update(['status' => 2,'update_time' => time()]);
         }
         //推送给前端消息
         $text['text'] = $step == 1 ? '交友结束' : '牵手良缘';
@@ -166,11 +167,16 @@ class Friend extends Model
         $originalPairs = db::name('vs_user_friending_heart')
             ->where(['id'=>$friending_heart['id']])
             ->update(['status' => 3,'friend_config_id' =>$friending_config_id]);
+
         $msg = '';
-        // 修改当前交友阶段
-        $res = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
-        $res2 = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
-        if ($originalPairs && $res && $res2) {
+
+        if ($originalPairs) {
+            // 修改当前交友阶段
+            $res = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
+            if($res){
+                $res2 = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2,'update_time' => time()]);
+            }
+
             //所有人下麦
             $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
             if($on_pit){
@@ -256,10 +262,14 @@ class Friend extends Model
 
             return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
         } else {
-            $ress = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
             $re2s = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
+            $ress = 0;
+            if($re2s){
+                $ress = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2,'update_time' => time()]);
+            }
+
             //推送给前端消息
-            $text['status1'] = $ress.'<=>'.$re2s.'<=>'.$res.'<=>'.$res2.'<=>'.$originalPairs;
+            $text['status1'] = $ress.'<=>'.$re2s.'<=>'.$originalPairs;
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text);
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 90607596..1413ca35 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1936,7 +1936,7 @@ class Room extends Model
                     $text = [
                         'userCharmList' => $room_pit,
                     ];
-                    model('Chat')->sendMsg(1019,$room_id,$text);
+                    model('Chat')->sendMsg(1019,$room_id,$text);//K歌房送礼后魅力变化 排序变化
                 }
             }
             return $res;