diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index 2adce7f2..6aeb696d 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -148,6 +148,13 @@ class Admin extends AdminBaseController return json($returnData); } + // 查询用户购买vip记录 + public function buyVipLog() + { + $returnData = (new AdminService())->buyVipLog($this->request->param()); + return json($returnData); + } + // 单次发送邮件或短信消息 public function sendEmailOrSms() { diff --git a/app/admin/route/app.php b/app/admin/route/app.php index f2ff2f6f..e1a5c1c9 100644 --- a/app/admin/route/app.php +++ b/app/admin/route/app.php @@ -226,7 +226,7 @@ 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_ist', 'User/bankList'); // 用户银行卡信息列表 + Route::post('/user/bank_list', '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'); @@ -240,6 +240,7 @@ Route::group('/', function () { // 送会员 Route::post('admin/give_vip', 'Admin/giveVip')->middleware('admin_log'); //赠送用户vip + Route::post('admin/buy_vip_log', 'Admin/buyVipLog')->middleware('admin_log'); //用户购买VIP记录 // 配置管理 // 外汇插针行情 @@ -685,7 +686,6 @@ Route::group('/', function () { Route::post('/user/loan', 'User/get_loan'); Route::post('/user/deal_loan', 'User/deal_loan'); - // 用户验证码 Route::post('/user/get_user_code', 'User/getUserCode'); })->allowCrossDomain($header) diff --git a/app/admin/service/AdminService.php b/app/admin/service/AdminService.php index 40ca8f06..8ad9a3ef 100644 --- a/app/admin/service/AdminService.php +++ b/app/admin/service/AdminService.php @@ -904,6 +904,28 @@ class AdminService extends AdminBaseService } } + // 查询用户购买vip记录 + public function buyVipLog($param) + { + try { + if (!isset($param['page']) || !isset($param['limit']) || !isset($param['user_id'])) { + return $this->toData('400', lang('parameter_error')); + } + $list = PurchaseVipLogModel::where(['user_id'=>$param['user_id']])->order('id', 'desc')->paginate([ + 'list_rows' => $param['limit'], + 'page' => $param['page'], + ]); + return $this->toData('0', 'successful', [ + 'list' => $list->items(), // 当前页的数据 + 'page' => $list->currentPage(), // 当前页码 + 'total' => $list->total(), // 总记录数 + 'last_page' => $list->lastPage(), // 最后一页页码 + ]); + } catch (\Exception $e) { + return $this->toData('500', 'The system is busy.', [$e->getMessage(), $e->getTrace()]); + } + } + // 单次发送邮件或短信 public function sendEmailOrSms($param) { diff --git a/app/admin/service/UserService.php b/app/admin/service/UserService.php index 68d2915e..030a5138 100644 --- a/app/admin/service/UserService.php +++ b/app/admin/service/UserService.php @@ -317,7 +317,6 @@ class UserService extends AdminBaseService $accountIds = array_merge($customerIds,$groupLeaderIds,$sellerIds); $accountList = AdminModel::where('id', 'in', $accountIds)->column('user_name', 'id'); - // 查询用户充值、提款冻结状态 $accountFrozenList = AccountFrozenModel::where('user_id', 'in', $userIdArr)->column('frozen_recharge,frozen_withdraw', 'user_id'); diff --git a/app/home/service/UserService.php b/app/home/service/UserService.php index fdff4b0d..678d3448 100644 --- a/app/home/service/UserService.php +++ b/app/home/service/UserService.php @@ -215,7 +215,6 @@ class UserService extends BaseHomeService } } - // 检测用户是否为有效VIP [判断规则 - 用户购买过VIP, 每个VIP有效期30天] $isVip = false; $vipExpire = ""; //vip到期时间