From 38795fe94c93125bfb632f87b6222dacfe03890f 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, 19 Nov 2025 16:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=86=85=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F=20=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 37 ++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index e4c10d9..c5e12c3 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1566,17 +1566,17 @@ class Room extends Model
         }
         $qinmi = null;
         $zhenai = null;
-        $guanxi = $this->relation_card($uid,$user_id);
-        if($guanxi['code'] == 1){
-            $qinmi_arr = $guanxi['data']['qinmi'];
-            if(!empty($qinmi_arr)){
-                $qinmi = $qinmi_arr[0];
-            }
-            $zhenai_arr = $guanxi['data']['zhenai'];
-            if(!empty($zhenai_arr)){
-                $zhenai = $zhenai_arr[0];
-            }
-        }
+//        $guanxi = $this->relation_card($uid,$user_id);
+//        if($guanxi['code'] == 1){
+//            $qinmi_arr = $guanxi['data']['qinmi'];
+//            if(!empty($qinmi_arr)){
+//                $qinmi = $qinmi_arr[0];
+//            }
+//            $zhenai_arr = $guanxi['data']['zhenai'];
+//            if(!empty($zhenai_arr)){
+//                $zhenai = $zhenai_arr[0];
+//            }
+//        }
         $user_info['qinmi'] = $qinmi;
         $user_info['zhenai'] = $zhenai;
 
@@ -1584,6 +1584,21 @@ class Room extends Model
         $Nobility = model('Nobility')->getUserNobilityInfo($user_id);//nobility_image
         $user_info['nobility_image'] = $Nobility['play_image'];
         $user_info['nickname_color'] = $Nobility['nick_name_color'];
+        //cp
+        //查询用户Cp空间
+        $res = Db::name('user_cp_zone')->where(['user_id1' => $user_id,'status' => 1])->field('user_id1,user_id2,level,exp')->find();
+        if(!$res){
+            $res = Db::name('user_cp_zone')->where(['user_id2' => $user_id,'status' => 1])->find();
+        }
+        if(!$res){
+            $user_info['cp_info'] = null;
+        }else{
+            $res['user_info1'] = Db::name('user')->where(['id' => $res['user_id1']])->field('id user_id,nickname,avatar')->find();
+            $res['user_info2'] = Db::name('user')->where(['id' => $res['user_id2']])->field('id user_id,nickname,avatar')->find();
+            //当前等级名称
+            $res['name'] = Db::name('user_cp_level')->where(['level' => $res['level']])->value('name');
+            $user_info['cp_info'] = $res;
+        }
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }