From 64a71565792d4f2e9fd31eab6e98e972c12daa86 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 27 十一月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index a02e3eb..fa51932 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -1,6 +1,8 @@
package com.ruoyi.account.controller;
+import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BaseTable;
@@ -9,6 +11,8 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* <p>
@@ -23,6 +27,8 @@
@RequestMapping("/app-user")
public class AppUserController {
+ @Resource
+ private AppUserService appUserService;
@@ -32,8 +38,7 @@
@PostMapping("/appletLogin")
@ApiOperation(value = "小程序一键登录")
public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.appletLogin(appletLogin);
}
@@ -41,8 +46,7 @@
@PostMapping("/mobileLogin")
@ApiOperation(value = "手机号登录")
public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.mobileLogin(mobileLogin);
}
@@ -51,8 +55,7 @@
@PostMapping("/getSMSCode")
@ApiOperation(value = "获取短信验证码")
public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.getSMSCode(smsCode);
}
@@ -61,8 +64,7 @@
@PostMapping("/registerAccount")
@ApiOperation(value = "注册新账号")
public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
- // todo 待完善 pu
- return AjaxResult.success();
+ return appUserService.registerAccount(registerAccount);
}
@@ -73,8 +75,10 @@
@ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
})
public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
- // todo 待完善 pu
- return AjaxResult.success();
+ AppUser appUser = appUserService.getById(id);
+ String phone = appUser.getPhone();
+ phone = phone.substring(0, 3) + "****" + phone.substring(7);
+ return AjaxResult.success(appUser.getName() + "-" + phone);
}
@@ -83,9 +87,13 @@
@GetMapping("/getNearbyReferrer")
@ApiOperation(value = "获取附近推荐人列表")
public AjaxResult<BaseTable<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer){
- // todo 待完善 pu
- return AjaxResult.success();
+ BaseTable<NearbyReferrerVo> baseTable = appUserService.getNearbyReferrer(nearbyReferrer);
+ return AjaxResult.success(baseTable);
}
+
+
+
+
}
--
Gitblit v1.7.1