From a40ad9a47d99b40282ea6becb8cae78829a25e70 Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 11:55:52 +0800
Subject: [PATCH] 1.完成开发门店打分接口
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 83 ++++++++++++++++++++++++++++++-----------
1 files changed, 61 insertions(+), 22 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 1deb0cd..3a296a4 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,16 +1,16 @@
package com.ruoyi.account.controller;
-import java.time.LocalDateTime;
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
+import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
+import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
import com.ruoyi.other.api.feignClient.StoreClient;
-import org.junit.Test;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,20 +20,13 @@
import javax.annotation.Resource;
import java.util.List;
-import com.ruoyi.account.api.model.AppUser;
-import com.ruoyi.account.service.AppUserService;
+
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
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>
@@ -46,7 +39,7 @@
@Api(tags = {"登录注册-小程序"})
@RestController
@RequestMapping("/app-user")
-public class AppUserController {
+public class AppUserController extends BaseController {
@@ -56,30 +49,65 @@
private AppUserService appUserService;
@Resource
private StoreClient storeClient;
+ @Resource
+ private UserCouponService userCouponService;
+
+
+ @ResponseBody
+ @PostMapping("/mobileLogin")
+ @ApiOperation(value = "手机号登录")
+ public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
+ return appUserService.mobileLogin(mobileLogin);
+ }
+
+
+
@ResponseBody
@PostMapping("/appletLogin")
@ApiOperation(value = "小程序一键登录")
- public AjaxResult<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
+ public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
return appUserService.appletLogin(appletLogin);
}
@ResponseBody
- @PostMapping("/mobileLogin")
- @ApiOperation(value = "手机号登录")
- public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
- return appUserService.mobileLogin(mobileLogin);
+ @PostMapping("/getAppUserById")
+ public AppUser getAppUserById(@RequestParam("id") Long id){
+ return appUserService.getById(id);
}
-
+
+ @ResponseBody
+ @PostMapping("/editAppUserById")
+ public R<Void> editAppUserById(@RequestBody AppUser appUser) {
+ appUserService.updateById(appUser);
+ return R.ok();
+
+ }
+
+ @ResponseBody
+ @PostMapping("/getCouponCount")
+ public R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId ){
+ Long count = userCouponService.lambdaQuery().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getCouponId, couponId).count();
+ return R.ok(count);
+ }
+
+ @ResponseBody
+ @PostMapping("/getVipCount")
+ public R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId ){
+ Long count = appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count();
+ return R.ok(count);
+ }
+
+
@ResponseBody
@PostMapping("/getSMSCode")
@ApiOperation(value = "获取短信验证码")
- public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
+ public R getSMSCode(@RequestBody SMSCode smsCode){
return appUserService.getSMSCode(smsCode);
}
@@ -88,7 +116,7 @@
@ResponseBody
@PostMapping("/registerAccount")
@ApiOperation(value = "注册新账号")
- public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
+ public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
return appUserService.registerAccount(registerAccount);
}
@@ -99,11 +127,11 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
})
- public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
+ 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 AjaxResult.success(appUser.getName() + "-" + phone);
+ return R.ok(appUser.getName() + "-" + phone);
}
@@ -147,7 +175,9 @@
}
- @PostMapping("/index")
+
+
+ @GetMapping("/index")
@ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
public R<AppUser> index(){
System.err.println("=-====");
@@ -185,6 +215,15 @@
}
+ /**
+ * 获取用户的祖籍列表
+ */
+ @GetMapping("/getUserAncestorList")
+ public R<List<AppUser>> getUserAncestorList(Long id){
+ List<AppUser> list = appUserService.getUserAncestorList(id,null);
+ return R.ok(list);
+ }
+
}
--
Gitblit v1.7.1