From 8a53e8aeaf108f802c0588461b4be3a1f55a31f3 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, 1 Dec 2025 09:42:49 +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=20=E7=94=A8=E6=88=B7=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 8 ++++++++
 application/api/model/User.php | 7 +++++++
 2 files changed, 15 insertions(+)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 323d65a..3aa546a 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1690,6 +1690,14 @@ class Room extends Model
             $res['pendant'] = model('api/Decorate')->user_decorate_detail($user_id, 11);//挂件(装扮）
             $user_info['cp_info'] = $res;
         }
+
+        //用户师傅
+        $master = db::name('vs_user_sign')->where(['sign_user_id' => $user_id,'end_time' => ['>',time()]])->value('parent_user_id');
+        if($master){
+            $user_info['master'] = Db::name('user')->where(['id' => $master])->field('id user_id,nickname,avatar')->find();
+        }else{
+            $user_info['master'] = null;
+        }
         return ['code' => 1, 'msg' => '成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 79c9c3a..c8ff60b 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -202,6 +202,13 @@ class User extends Model
             $res['pendant'] = model('api/Decorate')->user_decorate_detail($res['user_id1'], 11);
             $user_info['cp_info'] = $res;
         }
+        //用户师傅
+        $master = db::name('vs_user_sign')->where(['sign_user_id' => $uid,'end_time' => ['>',time()]])->value('parent_user_id');
+        if($master){
+            $user_info['master'] = Db::name('user')->where(['id' => $master])->field('id user_id,nickname,avatar')->find();
+        }else{
+            $user_info['master'] = null;
+        }
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }