From 281394e1bc95bf62bc7271b7f43a2dc499023a9f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 1 Jul 2024 14:34:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=88=B9=E5=8F=AA=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/user/UserLogic.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php
index 809056e1d..3c70dfa97 100644
--- a/app/admin/logic/user/UserLogic.php
+++ b/app/admin/logic/user/UserLogic.php
@@ -25,6 +25,7 @@ use app\common\model\user\UserAddress;
 use app\common\model\user\UserRecharge;
 use app\common\model\user_create_log\UserCreateLog;
 use app\common\model\user_label\UserLabel;
+use app\common\model\user_ship\UserShip;
 use app\common\model\user_sign\UserSign;
 use app\common\model\vip_flow\VipFlow;
 use think\facade\Db;
@@ -161,7 +162,7 @@ class UserLogic extends BaseLogic
     public static function detail(int $userId): array
     {
         $field = [
-            'id',  'account', 'nickname', 'avatar', 'real_name','integral','label_id',
+            'id',  'account', 'nickname', 'avatar', 'real_name','integral','label_id','user_ship',
             'sex', 'mobile', 'create_time', 'login_time', 'channel','now_money','purchase_funds'
         ];
 
@@ -171,7 +172,7 @@ class UserLogic extends BaseLogic
         $user['channel'] = UserTerminalEnum::getTermInalDesc($user['channel']);
         $user->sex = $user->getData('sex');
         $user['number']=StoreFinanceFlow::where('other_uid',$userId)->where(['status'=>0,'financial_pm'=>1,'type'=>1])->sum('number');
-        $user['label_name']=$user->label_id?UserLabel::where('label_id',$user->label_id)->value('label_name'):"";
+        $user['ship_name']=$user->user_ship>0?UserShip::where('id',$user->user_ship)->value('title'):"";
         return $user->toArray();
     }