From e3cf4be45df1c95385e994f498090266f684381f 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, 25 Aug 2025 16:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=20=E5=8D=A1=E5=85=B3?=
 =?UTF-8?q?=E7=B3=BB=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 1fd3e5d..8d4bc0c 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -111,7 +111,7 @@ class Friend extends Model
             $return['heart_value'] = $originalPairs['heart_value'];
             $return['heart_id'] = $originalPairs['id'];
             // 修改当前交友阶段
-            db::name('vs_room')->where(['id' => $room_id])->setField('step', $step);
+            db::name('vs_room')->where(['id' => $room_id])->setField(['step' => $step,'updatetime' => time()]);
         }else{
             $step = 1;//结束下一轮
             // 修改当前交友阶段   分开写  放到前面是为了下麦
@@ -151,6 +151,8 @@ class Friend extends Model
         $user2 = max($user1_id, $user2_id);
         $friending_heart = db::name('vs_user_friending_heart')
             ->where(['room_id'=>$room_id,'friend_id'=>$friend_id ,'user1_id' =>$user1,'user2_id' => $user2])->order('id desc')->find();
+        //开启事务
+        db::startTrans();
         $originalPairs = db::name('vs_user_friending_heart')
             ->where(['id'=>$friending_heart['id']])
             ->update(['status' => 3,'friend_config_id' =>$friending_config_id]);
@@ -164,6 +166,7 @@ class Friend extends Model
                     $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];
                 }
 
@@ -222,12 +225,14 @@ class Friend extends Model
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text);
+            db::commit();
             return ['code' => 1, 'msg' => '创建关系成功', 'data' => null];
         } else {
             //推送给前端消息
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text);
+            db::rollback();
             return ['code' => 0, 'msg' => '创建关系失败！', 'data' => null];
         }
     }