From 99c499df8214868d7195a7aa7fb4109a4756ab81 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:36:02 +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 | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php
index 4730822..a440cb5 100644
--- a/application/api/model/UserCp.php
+++ b/application/api/model/UserCp.php
@@ -74,15 +74,22 @@ class UserCp extends Model
             ];
             Db::name('user_cp_gift_log')->insert($datas);
 
-            $rees = Db::name('user_cp_zone')->where(['user_id1' => $from_user_id,'user_id2' => $to_user_id,'status' => 1])->find();
-            if(!$rees){
-                $rees = Db::name('user_cp_zone')->where(['user_id1' => $to_user_id,'user_id2' => $from_user_id,'status' => 1])->find();
-            }
+            $rees = Db::name('user_cp_zone')
+                ->whereOr(['user_id1' => $from_user_id,'status' => 1])
+                ->whereOr(['user_id2' => $from_user_id,'status' => 1])->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();
+            if($ress && $re != $ress['id']){
+                //修改状态
+                Db::name('user_cp_zone')->where(['id' => $ress['id']])->update(['status' => 2]);
+            }
+
             // 给两个用户添加CP装扮
             $pendant_ids = Db::name('user_cp_level')->where(['deletetime' => 0])->order('level asc')->value('pendant_id');
             $pendant_id = Db::name('vs_decorate_price')->where(['id' => $pendant_ids])->value('did');
@@ -100,11 +107,9 @@ class UserCp extends Model
             //给前端推送
             return 2;
         }else{//创建推送信息2：表达心动信号
-            //查询是否有相应的Cp空间
             $ress = Db::name('user_cp_find')
-                ->where(['status' => ['in',[0,1]]])
-                ->whereOr(['from_user_id' => $from_user_id])
-                ->whereOr(['to_user_id' => $from_user_id])
+                ->where(['status' => 0])
+                ->where(['from_user_id' => $from_user_id])
                 ->select();
             if($ress){
                 //把状态改为2 status：0-待回应，1-建交成功，2-已取消，