From 18945048bd64e3d40fc6ce91d747d662a438819e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Wed, 5 Nov 2025 15:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B5=E4=BD=8D=E6=8E=A5=E5=8F=A3=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4-=E5=90=8E=E5=8F=B0-=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Nobility.php | 14 +++++++++-----
 application/api/model/Nobility.php           |  6 +++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/application/adminapi/controller/Nobility.php b/application/adminapi/controller/Nobility.php
index c7a6a36..e4c2d45 100644
--- a/application/adminapi/controller/Nobility.php
+++ b/application/adminapi/controller/Nobility.php
@@ -34,7 +34,7 @@ class Nobility extends adminApi
         $page_limit = input('page_limit', 30);
         $count = db::name('vs_nobility')->where('delete_time', 0)->count();
         $lists = db::name('vs_nobility')
-            ->field('lid,name,image,images,pay_price,pay_price,renew_price,pay_coin,renew_coin,day,createtime,updatetime')
+            ->field('lid,name,image,images,pay_price,pay_price,renew_price,pay_coin,renew_coin,day,power_ids,createtime,updatetime')
             ->where('delete_time', 0)
             ->order($order, $sort)
             ->page($page, $page_limit)
@@ -42,6 +42,10 @@ class Nobility extends adminApi
         foreach ($lists as &$v) {
             $v['createtime'] = $v['createtime'] ? date('Y-m-d H:i:s', $v['createtime']) : '--';
             $v['updatetime'] = $v['updatetime'] ? date('Y-m-d H:i:s', $v['updatetime']) : '--';
+            $power_ids = $v['power_ids'] ? explode(',', $v['power_ids']) : [];
+            $v['power_ids_array'] = db::name('vs_nobility_power')
+                ->field('id,name')
+                ->where(['id'=>['in',$power_ids]])->select();
         }
         $return_data = [
             'page' =>$page,
@@ -284,14 +288,14 @@ class Nobility extends adminApi
             ->page($page, $page_limit)
             ->select();
         foreach ($lists as &$list){
-            $list['user_nick_name'] = db::name('vs_user')->where('id', $list['user_id'])->value('nick_name');
+            $list['user_nick_name'] = db::name('user')->where('id', $list['user_id'])->value('nickname');
             $list['nick_name_color'] = db::name('vs_nobility')->where('lid', $list['lid'])->value('nick_name_color');
             //头像
-            $list['user_avatar'] = db::name('vs_user')->where('id', $list['user_id'])->value('avatar');
+            $list['user_avatar'] = db::name('user')->where('id', $list['user_id'])->value('avatar');
             //爵位名称
             $list['nobility_name'] = db::name('vs_nobility')->where('lid', $list['lid'])->value('name');
-            $list['createtime'] = date('Y-m-d H:i:s', $list['createtime']);
-            $list['updatetime'] = date('Y-m-d H:i:s', $list['updatetime']);
+            $list['createtime'] = $list['createtime'] ? date('Y-m-d H:i:s', $list['createtime']) : '--';
+            $list['updatetime'] = $list['updatetime'] ? date('Y-m-d H:i:s', $list['updatetime']) : '--';
         }
         $return_data = [
             'page' =>$page,
diff --git a/application/api/model/Nobility.php b/application/api/model/Nobility.php
index c92b607..4be60db 100644
--- a/application/api/model/Nobility.php
+++ b/application/api/model/Nobility.php
@@ -111,7 +111,7 @@ class Nobility extends Model
     }
 
     //购买爵位
-    public static function buyNobility($user_id,$lid){
+    public function buyNobility($user_id,$lid){
         $nobility_info = db::name('vs_nobility')
             ->field('lid,name,pay_price,pay_coin')
             ->where('delete_time', 0)
@@ -199,7 +199,7 @@ class Nobility extends Model
     }
 
     //购买爵位价格
-    public static function buyNobilityPrice($user_id,$lid){
+    public  function buyNobilityPrice($user_id,$lid){
         $nobility_info = db::name('vs_nobility')
             ->field('lid,name,image,pay_price,renew_price,day,power_ids')
             ->where('delete_time', 0)
@@ -262,7 +262,7 @@ class Nobility extends Model
     }
 
     //获取用户爵位信息
-    public static function getUserNobilityInfo($user_id){
+    public  function getUserNobilityInfo($user_id){
         $user_nobility_info = db::name('vs_user_nobility')
             ->field('id,user_id,lid,end_time')
             ->where('delete_time', 0)