From 515003b9d34c8e589e78e04c426feff91973d55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Wed, 10 Sep 2025 19:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E7=BB=93=E6=9D=9F60=E7=A7=92?=
 =?UTF-8?q?=E8=AF=AF=E6=93=8D=E4=BD=9C=E8=87=AA=E5=8A=A8=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index bc99c5d..320a69d 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -113,12 +113,15 @@ 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')??time();
-            if(time() - $room_updatatime > 60){
-                $this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
+            $room_updatatime = db::name('vs_room')->where(['id' => $room_id,'step' => $step])->value('updatetime');
+            if($room_updatatime){ //60秒内没操作 则创建关系无
+                if(time() - $room_updatatime > 60){
+                    $this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
+                }
+            }else{
+                // 修改当前交友阶段
+                db::name('vs_room')->where(['id' => $room_id])->update(['step' => $step,'updatetime' => time()]);
             }
-            // 修改当前交友阶段
-            db::name('vs_room')->where(['id' => $room_id])->update(['step' => $step,'updatetime' => time()]);
         }else{
             $step = 1;//结束下一轮
             // 修改当前交友阶段   分开写  放到前面是为了下麦