From ca8dca40fe18b034f1aace895fdc7b9e6963e631 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, 24 Nov 2025 14:47:54 +0800
Subject: [PATCH] =?UTF-8?q?cp=20=E7=AD=89=E7=BA=A7=E5=8D=87=E7=BA=A7=20?=
 =?UTF-8?q?=E8=A3=85=E6=89=AE=E6=8C=82=E4=BB=B6=E5=92=8C=E7=89=B9=E6=95=88?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/UserCp.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php
index a440cb5..aa3bee4 100644
--- a/application/api/model/UserCp.php
+++ b/application/api/model/UserCp.php
@@ -75,16 +75,19 @@ class UserCp extends Model
             Db::name('user_cp_gift_log')->insert($datas);
 
             $rees = Db::name('user_cp_zone')
-                ->whereOr(['user_id1' => $from_user_id,'status' => 1])
-                ->whereOr(['user_id2' => $from_user_id,'status' => 1])->find();
+                ->where(['status' => 1])
+                ->where('(user_id1 = '.$from_user_id.' OR user_id2 = '.$from_user_id.')')
+                ->find();
+
             if($rees && $re != $rees['id']){
                 //修改状态
                 Db::name('user_cp_zone')->where(['id' => $rees['id']])->update(['status' => 2]);
             }
 
             $ress = Db::name('user_cp_zone')
-                ->whereOr(['user_id1' => $to_user_id,'status' => 1])
-                ->whereOr(['user_id2' => $to_user_id,'status' => 1])->find();
+                ->where(['status' => 1])
+                ->where('(user_id1 = '.$to_user_id.' OR user_id2 = '.$to_user_id.')')
+                ->find();
             if($ress && $re != $ress['id']){
                 //修改状态
                 Db::name('user_cp_zone')->where(['id' => $ress['id']])->update(['status' => 2]);
@@ -108,8 +111,7 @@ class UserCp extends Model
             return 2;
         }else{//创建推送信息2：表达心动信号
             $ress = Db::name('user_cp_find')
-                ->where(['status' => 0])
-                ->where(['from_user_id' => $from_user_id])
+                ->where(['from_user_id' => $from_user_id,'status' => 0])
                 ->select();
             if($ress){
                 //把状态改为2 status：0-待回应，1-建交成功，2-已取消，