From 3f41bab8136c5d2d7037f69b2686c97a9d133f5b 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 20:18:26 +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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 320a69d..daaf65f 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -117,6 +117,7 @@ class Friend extends Model
             if($room_updatatime){ //60秒内没操作 则创建关系无
                 if(time() - $room_updatatime > 60){
                     $this->createRelation(0,$room_id,$id,$return['user1_id'],$return['user2_id'],0);
+                    return ['code' => 1, 'msg' => '操作成功！', 'data' => $return];
                 }
             }else{
                 // 修改当前交友阶段
@@ -125,7 +126,7 @@ class Friend extends Model
         }else{
             $step = 1;//结束下一轮
             // 修改当前交友阶段   分开写  放到前面是为了下麦
-            db::name('vs_room')->where(['id' => $room_id])->setField('step', $step);
+            db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
            //所有人下麦
             $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
             if($on_pit){
@@ -213,7 +214,7 @@ class Friend extends Model
             }
 
             // 修改当前交友阶段
-            db::name('vs_room')->where(['id' => $room_id])->setField('step', 1);
+            db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
             db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
             //所有人下麦
             $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();