From bfb7fdb2e827f9821da1fd5a0c1175bc25a0cea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 12 Dec 2025 22:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=88=E5=BE=92=E4=BB=BB=E5=8A=A1=20=20?=
 =?UTF-8?q?=E5=8D=A1=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Friend.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 312d66ed..16c302d5 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -231,12 +231,24 @@ class Friend extends Model
             $text1['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text1);
             //查询是否第一次创建关系
-            $friend_count1 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user1,'status'=>3])->whereOr(['user2_id'=>$user1,'status'=>3])->count();
+            $friend_count1 = db::name('vs_user_friending_heart')
+                ->where('status', 3)
+                ->where(function($query) use ($user1) {
+                    $query->where('user1_id', $user1)
+                        ->whereOr('user2_id', $user1);
+                })
+                ->count();
             if($friend_count1 == 1){
                 //任务：10-第一次星球房卡关系（互娱房）
                 model('Tasks')->tasks_complete($user1,10);
             }
-            $friend_count2 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user2,'status'=>3])->whereOr(['user2_id'=>$user2,'status'=>3])->count();
+            $friend_count2 = db::name('vs_user_friending_heart')
+                ->where('status', 3)
+                ->where(function($query) use ($user2) {
+                    $query->where('user1_id', $user2)
+                        ->whereOr('user2_id', $user2);
+                })
+                ->count();
             if($friend_count2 == 1){
                 //任务：10-第一次星球房卡关系（互娱房）
                 model('Tasks')->tasks_complete($user2,10);