From d1875d3b825c25b754eb8910dfa2e9ae00bc41b1 Mon Sep 17 00:00:00 2001 From: lingling <1077478963@qq.com> Date: Thu, 20 Feb 2025 13:34:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/api/v1/DashboardController.php | 33 +++- app/controller/api/SignController.php | 1 - app/controller/api/v1/MessageController.php | 35 ----- app/controller/api/v1/UserController.php | 145 ------------------ 4 files changed, 31 insertions(+), 183 deletions(-) delete mode 100644 app/controller/api/v1/MessageController.php delete mode 100644 app/controller/api/v1/UserController.php diff --git a/app/controller/admin/api/v1/DashboardController.php b/app/controller/admin/api/v1/DashboardController.php index f17e87e..c68facf 100644 --- a/app/controller/admin/api/v1/DashboardController.php +++ b/app/controller/admin/api/v1/DashboardController.php @@ -22,13 +22,42 @@ class DashboardController * @Apidoc\Url("admin/api/v1/Dashboard/index") * @Apidoc\Method("POST") */ - public function index() + public function index(Request $request) { $res = []; $res['user_total'] = User::count(); $res['user_phone'] = UserPhone::count(); - $res['withdraw'] = Withdraw::groupBy('user_id')->count(); + $res['withdraw'] =withdraw::query()->distinct('user_id')->count('user_id'); // 统计不同的 user_id 个数; $res['user_phone_onlin'] = UserPhone::where('status', 1)->count(); return ApiResponse::success(200, $res); } + /** + * @Apidoc\Title("1.0 首页用户注册分析") + * @Apidoc\Url("admin/api/v1/Dashboard/useranalysis") + * @Apidoc\Method("POST") + */ + public function useranalysis(Request $request) + { + $res = []; + $res['user_total'] = User::count(); + $res['register'] = User::where('f_id',0)->count(); + $res['inviteregistration'] =User::where('f_id','>',0)->count(); // 统计不同的 user_id 个数; + return ApiResponse::success(200, $res); + } + /** + * @Apidoc\Title("1.0 首页用户按照时间展示数据") + * @Apidoc\Url("admin/api/v1/Dashboard/useranalysis_time") + * @Apidoc\Method("POST") + */ + public function useranalysis_time(Request $request) + { + /** + * 登录人数 注册人数 提款人数 默认今天 + */ + $res = []; + $res['user_total'] = User::count(); + $res['register'] = User::where('f_id',0)->count(); + $res['inviteregistration'] =User::where('f_id','>',0)->count(); // 统计不同的 user_id 个数; + return ApiResponse::success(200, $res); + } } diff --git a/app/controller/api/SignController.php b/app/controller/api/SignController.php index 9d135b5..e7fc7d4 100644 --- a/app/controller/api/SignController.php +++ b/app/controller/api/SignController.php @@ -60,7 +60,6 @@ class SignController */ public function sign(Request $request) { - //这里 补签没做 逻辑不清晰 $user_id=$request->data['id']; if(!UserPhoneLogDao::getOnlineTimeByPhoneTodayId($user_id)){ return ApiResponseApp::error([],'挂机时长没有超过6小时，暂不能签到'); diff --git a/app/controller/api/v1/MessageController.php b/app/controller/api/v1/MessageController.php deleted file mode 100644 index 8a321cf..0000000 --- a/app/controller/api/v1/MessageController.php +++ /dev/null @@ -1,35 +0,0 @@ -data; - $userid=$user['id']; - /** - * 通过中间件获取userid - */ - $userid=$user['id']; - $res = Message::where('userid',$userid)->get(); - return ApiResponse::success(200,$res); - } -} \ No newline at end of file diff --git a/app/controller/api/v1/UserController.php b/app/controller/api/v1/UserController.php deleted file mode 100644 index eb32cbc..0000000 --- a/app/controller/api/v1/UserController.php +++ /dev/null @@ -1,145 +0,0 @@ -post(); - - // 根据手机号查询用户 - $db = User::where('phone', '=', $data['phone'])->first(); - - // 如果未找到用户，返回错误 - if (!$db) { - return ApiResponse::error(402, '用户未注册'); - } - - // 获取用户输入的密码 - $password = $data['password']; - - // 验证密码是否正确 - if (password_verify($password, $db->password)) { - $user = [ - 'id' => $db->id, - 'nickname' => $db->nickname, - 'phone' => $db->phone - ]; - // 如果密码正确，生成 JWT 令牌 - $token = JwtToken::generateToken($user); - - // 返回成功响应和用户信息（可以将 token 添加到响应中） - return ApiResponse::success(200, [ - 'user' => $user, // 返回用户信息 - 'token' => $token // 返回生成的 token - ]); - } else { - // 密码错误，返回错误响应 - return ApiResponse::error(402, '密码错误'); - } - } - /** - * @Apidoc\Title("1.0 注册") - * @Apidoc\Url("api/v1/user/register") - * @Apidoc\Method("POST") - * @Apidoc\Param("phone", type="string",require=true, desc="用户名|手机号") - * @Apidoc\Param("password", type="string",require=true, desc="密码") - * @Apidoc\Param("idcard", type="string",require=true, desc="身份证号") - * @Apidoc\Returned("token", type="object", desc="令牌") - */ - public function register(Request $request) - { - $data = $request->post(); - $user = UserDao::register($data['phone'], $data['password'], $data['idcard']); - if ($user['code'] != 200) { - return ApiResponse::error(402, [], $user['message']); - } - $db = User::where('phone', '=', $data['phone'])->first(); - $user = [ - 'id' => $db->id, - 'nickname' => $db->nickname, - 'phone' => $db->phone - ]; - // 如果密码正确，生成 JWT 令牌 - $token = JwtToken::generateToken($user); - $msg = new Message(); - $msg->title ="系统提醒"; - $msg->content = "您已注册成功"; - $msg->type =0; - $msg->userid =$db->id; - $msg->parameters=""; - // 返回成功响应和用户信息（可以将 token 添加到响应中） - return ApiResponse::success(200, [ - 'user' => $user, // 返回用户信息 - 'token' => $token // 返回生成的 token - ]); - } - - /** - * @Apidoc\Title("1.0 修改用户信息") - * @Apidoc\Url("api/v1/user/edi") - * @Apidoc\Method("POST") - * @Apidoc\Param("nickname", type="string",require=true, desc="昵称") - * @Apidoc\Param("oldpassword", type="string",require=true, desc="旧密码") - * @Apidoc\Param("password", type="string",require=true, desc="密码") - */ - public function edi(Request $request) - { - $data = $request->post(); - $user = $request->data; - $userid = $user['id']; - $db = User::where('id', '=', $userid)->first(); - if (isset($data['password']) && $data['password'] != '') { - if (password_verify($data['oldpassword'], $db->password)) { - UserDao::chang_passwd($userid, $data['password']); - return ApiResponse::success(200, [], "修改密码成功"); - } - return ApiResponse::success(402, [], "旧密码错误"); - } - if (isset($data['nickname']) && $data['nickname'] != '') { - UserDao::chang_nickname($userid, $data['nickname']); - - $user = [ - 'id' => $db->id, - 'nickname' => $data['nickname'], - ]; - // 返回成功响应和用户信息（可以将 token 添加到响应中） - return ApiResponse::success(200, [ - 'user' => $user, // 返回用户信息 - ]); - } - } - - - -}