From 10b3a0151371bc1f5dbd7a0a190a9dee7d99d0fc 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, 21 Nov 2025 18:35:38 +0800
Subject: [PATCH] =?UTF-8?q?cp=E8=A3=85=E6=89=AE=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 | 43 +++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/application/api/model/UserCp.php b/application/api/model/UserCp.php
index d14cd01..270e83c 100644
--- a/application/api/model/UserCp.php
+++ b/application/api/model/UserCp.php
@@ -71,15 +71,22 @@ class UserCp extends Model
             $pendant_id = Db::name('user_cp_level')->where(['deletetime' => 0])->order('level asc')->value('pendant_id');
             // 给两个用户添加CP装扮
             //先检查该用户是否已有该装扮
-            $zhuangban = Db::name('vs_user_decorate')->where(['user_id' => $from_user_id,'type' => 11,'did' => $pendant_id])->find();
-            if ($zhuangban) {
-                // 修改
-                Db::name('vs_user_decorate')->where(['id' => $zhuangban['id']])->update(['is_using' => 2]);
-            }
-            $zhuangban1 = Db::name('vs_user_decorate')->where(['user_id' => $to_user_id,'type' => 11,'did' => $pendant_id])->find();
-            if ($zhuangban1) {
-                // 修改
-                Db::name('vs_user_decorate')->where(['id' => $zhuangban1['id']])->update(['is_using' => 2]);
+            foreach ([$from_user_id, $to_user_id] as $user_id) {
+                $zhuangban = Db::name('vs_user_decorate')
+                    ->where([
+                        'user_id' => $user_id,
+                        'type' => 11,
+                        'did' => $pendant_id,
+                        'is_using' => 1
+                    ])
+                    ->find();
+
+                if ($zhuangban) {
+                    // 修改状态为未使用
+                    Db::name('vs_user_decorate')
+                        ->where(['id' => $zhuangban['id']])
+                        ->update(['is_using' => 2]);
+                }
             }
 
             $decorate_data = [
@@ -161,6 +168,24 @@ class UserCp extends Model
             $data['level'] = $level['level'];
             //给用户修改Cp装扮
             if($level['pendant_id']){
+                //先检查该用户是否已有该装扮
+                foreach ([$from_user_id, $to_user_id] as $user_id) {
+                    $zhuangban = Db::name('vs_user_decorate')
+                        ->where([
+                            'user_id' => $user_id,
+                            'type' => 11,
+                            'did' => $level['pendant_id'],
+                            'is_using' => 1
+                        ])
+                        ->find();
+
+                    if ($zhuangban) {
+                        // 修改状态为未使用
+                        Db::name('vs_user_decorate')
+                            ->where(['id' => $zhuangban['id']])
+                            ->update(['is_using' => 2]);
+                    }
+                }
                 // 给两个用户添加CP装扮
                 $decorate_data = [
                     'type' => 11,           // 装扮类型11-cp装扮