From 46310e310d274d68f234af165f862a74379b082c Mon Sep 17 00:00:00 2001
From: chuan <2154243450@qq.com>
Date: Sat, 21 Jun 2025 18:39:40 +0800
Subject: [PATCH] up

---
 app/admin/controller/User.php     | 11 +++++++--
 app/admin/route/app.php           |  5 ++--
 app/admin/service/UserService.php | 39 +++++++++++++++++++++++++++----
 3 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php
index cfd8722f..968b04c6 100644
--- a/app/admin/controller/User.php
+++ b/app/admin/controller/User.php
@@ -100,16 +100,23 @@ class User extends AdminBaseController
         return json($result);
     }
 
+    public function bankList()
+    {
+        $service = new UserService();
+        $result = $service->bankList($this->request->post());
+        return json($result);
+    }
+
     public function bankDetail()
     {
         $service = new UserService();
-        $result = $service->bankDetail($this->request->param());
+        $result = $service->bankDetail($this->request->post());
         return json($result);
     }
 
     public function editBank(){
         $service = new UserService();
-        $result = $service->editBank($this->request->param());
+        $result = $service->editBank($this->request->post());
         return json($result);
     }
 
diff --git a/app/admin/route/app.php b/app/admin/route/app.php
index 4f433bdb..6094bd5f 100644
--- a/app/admin/route/app.php
+++ b/app/admin/route/app.php
@@ -225,8 +225,9 @@ Route::group('/', function () {
     Route::post('user/edit_user_base_label', 'User/editUserBaseLabel')->middleware('admin_log');   //编辑用户的base_label字段
     Route::post('/user/reg_phone', 'User/reg_phone')->middleware('admin_log');
     Route::post('/user/reg_email', 'User/reg_email')->middleware('admin_log');
-    Route::post('/user/bank', 'User/bankDetail');
-    Route::post('/user/edit_bank', 'User/editBank')->middleware('admin_log');
+    Route::post('/user/bank_ist', 'User/bankList'); // 用户银行卡信息列表
+    Route::post('/user/bank', 'User/bankDetail');   // 用户银行卡详情
+    Route::post('/user/edit_bank', 'User/editBank')->middleware('admin_log'); // 编辑银行卡信息
     Route::post('user/edit_password', 'User/editPassword')->middleware('admin_log');
     Route::post('user/frozen', 'User/frozen'); //用户充值、提款封禁与解封
     Route::post('user/edit_user_stage', 'User/editUserStage'); //编辑用户阶段信息
diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php
index f0c2e9ee..68d2915e 100644
--- a/app/admin/service/UserService.php
+++ b/app/admin/service/UserService.php
@@ -11,6 +11,7 @@ use app\model\AuthRoleModel;
 use app\model\AwsS3Model;
 use app\model\CountryModel;
 use app\model\GroupLeaderWithUserModel;
+use app\model\PurchaseVipModel;
 use app\model\SellerWithUserModel;
 use app\model\StockMarketModel;
 use app\model\UserBankModel;
@@ -339,6 +340,9 @@ class UserService extends AdminBaseService
                 }
             }
 
+            // 用户vip信息
+            $vipInfo = PurchaseVipModel::where('user_id', 'in', $userIdArr)->column('user_id,expire', 'user_id');
+
             // 用户阶段信息
             $userStageStateList = UserStageStateModel::where('user_id', 'in', $userIdArr)->column('first_stage,first_stage_state,second_stage,second_stage_state,third_stage,third_stage_state', 'user_id');
 
@@ -367,6 +371,13 @@ class UserService extends AdminBaseService
                 if ($sellerId) {
                     $sellerName = $accountList[$sellerId] ?? "";  // 电销员名称
                 }
+                // vip信息
+                $isVip = false;
+                $vipExpire = -1;
+                if (isset($vipInfo[$item['user_id']]['expire']) && $vipInfo[$item['user_id']]['expire'] >= date("Y-m-d H:i:s")) {
+                    $isVip = true;
+                    $vipExpire = $vipInfo[$item['user_id']]['expire'];
+                }
 
                 $rows[] = [
                     'id' => $item['user_id'],
@@ -396,6 +407,8 @@ class UserService extends AdminBaseService
                     'second_stage_state' => $userStageStateList[$item['user_id']]['second_stage_state'] ?? 0,
                     'third_stage' => $userStageStateList[$item['user_id']]['third_stage'] ?? '',
                     'third_stage_state' => $userStageStateList[$item['user_id']]['third_stage_state'] ?? 0,
+                    'is_vip' => $isVip,   // 是否vip
+                    'vip_expire' => $vipExpire, // vip到期时间
 
                     //余额
                     'digital' => $userDigitalList[$item['user_id']]['usable_num'] ?? '0',
@@ -1212,12 +1225,27 @@ class UserService extends AdminBaseService
         return $this->toData('0', 'success', ['code' => $code, 'expiration_time' => $time]);
     }
 
-    // 用户银行卡
+    // 用户银行卡列表
+    public function bankList($param)
+    {
+        try {
+            $userId = $param['user_id'] ?? 0;
+            if (empty($userId) || !is_numeric($userId)) {
+                return $this->toData('400', 'Param error user_id', [$userId]);
+            }
+            $list = UserBankModel::where(['user_id'=>$param['user_id']])->select()->toArray();
+            return $this->toData('0', 'success', $list);
+        } catch (\Exception $e) {
+            return $this->toData('1', '系统异常 请稍后重试', [$e->getMessage(), $e->getTrace()]);
+        }
+    }
+
+    // 用户银行卡详情
     public function bankDetail($param)
     {
         try {
-            $userId = $param['user_id'] ?? '';
-            if (!is_numeric($userId)) {
+            $userId = $param['user_id'] ?? 0;
+            if (empty($userId) || !is_numeric($userId)) {
                 return $this->toData('100400', 'Param error', []);
             }
 
@@ -1232,16 +1260,17 @@ class UserService extends AdminBaseService
         }
     }
 
+    // 编辑银行卡信息
     public function editBank($param)
     {
         try {
             if (empty($param['id'])) {
-                return $this->toData('100400', 'Param error', []);
+                return $this->toData('400', '缺少参数id', []);
             }
 
             $bank = UserBankModel::getUserBankInfoById(['id' => $param['id']]);
             if (empty($bank)) {
-                return $this->toData('100400', 'Param error', []);
+                return $this->toData('400', '编辑的数据不存在', []);
             }
 
             $updateArr = [