From 2ccdf86ac2599562ca994bc4047ded2d925e8bae Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 29 十一月 2024 16:33:12 +0800
Subject: [PATCH] 开发确认购物车订单逻辑

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java |   53 ++++++++++++++++++++++++++++++++---------------------
 1 files changed, 32 insertions(+), 21 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..32e001d 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,14 +1,20 @@
 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;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -21,8 +27,10 @@
 @Api(tags = {"登录注册-小程序"})
 @RestController
 @RequestMapping("/app-user")
-public class AppUserController {
+public class AppUserController extends BaseController {
 	
+	@Resource
+	private AppUserService appUserService;
 	
 	
 	
@@ -31,18 +39,16 @@
 	@ResponseBody
 	@PostMapping("/appletLogin")
 	@ApiOperation(value = "小程序一键登录")
-	public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
+		return appUserService.appletLogin(appletLogin);
 	}
 	
 	
 	@ResponseBody
 	@PostMapping("/mobileLogin")
 	@ApiOperation(value = "手机号登录")
-	public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
+		return appUserService.mobileLogin(mobileLogin);
 	}
 	
 	
@@ -50,9 +56,8 @@
 	@ResponseBody
 	@PostMapping("/getSMSCode")
 	@ApiOperation(value = "获取短信验证码")
-	public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R getSMSCode(@RequestBody SMSCode smsCode){
+		return appUserService.getSMSCode(smsCode);
 	}
 	
 	
@@ -60,9 +65,8 @@
 	@ResponseBody
 	@PostMapping("/registerAccount")
 	@ApiOperation(value = "注册新账号")
-	public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
+		return appUserService.registerAccount(registerAccount);
 	}
 	
 	
@@ -72,9 +76,11 @@
 	@ApiImplicitParams({
 			@ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
 	})
-	public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public R<String> getReferrer(@PathVariable("id") Long id){
+		AppUser appUser = appUserService.getById(id);
+		String phone = appUser.getPhone();
+		phone = phone.substring(0, 3) + "****" + phone.substring(7);
+		return R.ok(appUser.getName() + "-" + phone);
 	}
 	
 	
@@ -82,10 +88,15 @@
 	@ResponseBody
 	@GetMapping("/getNearbyReferrer")
 	@ApiOperation(value = "获取附近推荐人列表")
-	public AjaxResult<BaseTable<NearbyReferrerVo>> getNearbyReferrer(NearbyReferrer nearbyReferrer){
-		// todo 待完善 pu
-		return AjaxResult.success();
+	public TableDataInfo<NearbyReferrerVo> getNearbyReferrer(NearbyReferrer nearbyReferrer){
+		startPage();
+		List<NearbyReferrerVo> list = appUserService.getNearbyReferrer(nearbyReferrer);
+		return getDataTable(list);
 	}
 	
+	
+	
+	
+	
 }
 

--
Gitblit v1.7.1