From 149946b45f0fe499afbba29cbf26d49ddbc57565 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 22 Jun 2024 16:02:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=85=85=E5=80=BC=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E5=92=8C=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E7=A7=B0=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/user/UserRechargeLists.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/api/lists/user/UserRechargeLists.php b/app/api/lists/user/UserRechargeLists.php
index 2090f6420..2578ffadc 100644
--- a/app/api/lists/user/UserRechargeLists.php
+++ b/app/api/lists/user/UserRechargeLists.php
@@ -6,6 +6,7 @@
 	use app\common\lists\ListsSearchInterface;
 	use app\common\model\user\User;
 	use app\common\model\user\UserFeedback;
+use app\common\model\user_label\UserLabel;
 use app\common\model\user_recharge\UserRecharge;
 
 	//用户充值表
@@ -42,7 +43,16 @@ use app\common\model\user_recharge\UserRecharge;
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
 				->select()->each(function($data){
-					$data['real_name'] =User::where('id',$data['uid'])->value('real_name');
+					if($data['recharge_type']=='INDUSTRYMEMBERS'){
+						$find =User::where('id',$data['uid'])->find();
+						$data['real_name']=$find['find'];
+						if($find['label_id']>0){
+							$data['label_name']=UserLabel::where('id',$find['label_id'])->value('label_name');
+						}
+					}else{
+						$data['real_name'] =User::where('id',$data['uid'])->value('real_name');
+					}
+					return $data;
 				})
 				->toArray();
 		}