From 6d1cd76c47e92f6fbb33a1274cfec4c88e09938f Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期四, 05 十二月 2024 15:00:44 +0800
Subject: [PATCH] 1.完成开发门店打分接口
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 74 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 20 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 4df7a2e..2a58d42 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.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>
@@ -56,12 +49,18 @@
private AppUserService appUserService;
@Resource
private StoreClient storeClient;
+ @Resource
+ private UserCouponService userCouponService;
- @PostMapping("getAppUserById")
- AppUser getAppUserById(@RequestParam("id") Long id){
- return appUserService.getById(id);
+ @ResponseBody
+ @PostMapping("/mobileLogin")
+ @ApiOperation(value = "手机号登录")
+ public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
+ return appUserService.mobileLogin(mobileLogin);
}
+
+
@@ -75,12 +74,34 @@
@ResponseBody
- @PostMapping("/mobileLogin")
- @ApiOperation(value = "手机号登录")
- public R<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
@@ -137,7 +158,7 @@
private UserCancellationLogService userCancellationLogService;
@ResponseBody
- @PostMapping("/unregis")
+ @GetMapping("/unregis")
@ApiOperation(value = "注销", tags = {"小程序-个人中心首页-我的资料"})
public R unregis(){
Long userId = tokenService.getLoginUserApplet().getUserid();
@@ -154,7 +175,9 @@
}
- @PostMapping("/index")
+
+
+ @GetMapping("/index")
@ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
public R<AppUser> index(){
System.err.println("=-====");
@@ -192,6 +215,17 @@
}
+ @GetMapping("/index/change")
+ @ApiOperation(value = "修改个人资料", tags = {"小程序-个人中心首页"})
+ public R<AppUser> indexchange(String avatar,String name){
+ Long userId = tokenService.getLoginUserApplet().getUserid();
+ //当前用户信息
+ AppUser user = appUserService.getById(userId);
+ user.setName(name);
+ user.setAvatar(avatar);
+ appUserService.updateById(user);
+ return R.ok();
+ }
/**
* 获取用户的祖籍列表
*/
--
Gitblit v1.7.1