From 72d7a97fd060100d76e611fab6546dfe7b24d652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Fri, 10 May 2024 09:45:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E6=8C=89=E9=92=AE=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppLoginController.java | 21 +++++-- .../app/controller/AppRegisterController.java | 6 +- .../ruoyi/app/domain/vo/AppUserDataVo.java | 2 + .../java/com/ruoyi/app/form/RegisterForm.java | 4 ++ .../app/service/IAppRegisterService.java | 2 +- .../service/impl/AppRegisterServiceImpl.java | 14 +++-- .../impl/AppUserDynamicServiceImpl.java | 3 +- gan-ui/src/api/app/dynamic.js | 9 +++ gan-ui/src/api/app/register.js | 6 +- gan-ui/src/views/app/dynamic/detail.vue | 6 ++ gan-ui/src/views/app/dynamic/index.vue | 57 +++++++++++++++---- gan-ui/src/views/app/register/index.vue | 29 +++++++--- 12 files changed, 121 insertions(+), 38 deletions(-) create mode 100644 gan-ui/src/views/app/dynamic/detail.vue diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java index 8249087..68a6305 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java @@ -51,16 +51,27 @@ public class AppLoginController { public R register(@RequestBody RegisterForm registerForm) { AppUser appUser = appUserService.selectAppUserByPhone(registerForm.getPhoneNumber()); AppRegister register = appRegisterService.selectAppRegisterByphone(registerForm.getPhoneNumber()); + Assert.notNull(registerForm.getSchoolId(), "学校id不能为空"); Assert.isNull(appUser, "手机号已注册"); - Assert.isNull(register, "手机号已提交审核，请勿多次提交"); -// if (StringUtils.isNotEmpty(registerForm.getEmail())) { -// -// } + + if (register != null && register.getStatus() != null) { + + + switch (register.getStatus()) { + case 0: + return R.fail(201, "注册失败，您的账号正在审核中！"); + case 1: + return R.fail(201, "您的账号已通过"); + case 2: + return R.fail(201, "注册失败，您的账号已被驳回！"); + } + } + AppRegister appRegister = setAppRegister(registerForm); appRegister.setInvitationCode(registerForm.getInvitationCode()); int i = appRegisterService.insertAppRegister(appRegister); -// redisService.deleteObject(registerForm.getPhoneNumber()); + Assert.isTrue(i > 0, "注册失败"); return R.ok(null,"注册成功,请等待审核结果！"); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java index 3cb088d..0e4c431 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppRegisterController.java @@ -96,10 +96,10 @@ public class AppRegisterController extends BaseController return toAjax(appRegisterService.passAppRegister(id)); } - @GetMapping("/reject") - public AjaxResult reject(@RequestParam("id") Long id) + @PostMapping("/reject") + public AjaxResult reject(@RequestBody AppRegister appRegister) { - return toAjax(appRegisterService.rejectAppRegister(id)); + return toAjax(appRegisterService.rejectAppRegister(appRegister)); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java index 6009937..44d8848 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDataVo.java @@ -41,4 +41,6 @@ public class AppUserDataVo @Excel(name = "粉丝数量") private long fansNum; + + private Long userId; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java index ae742d0..84167a7 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/form/RegisterForm.java @@ -1,5 +1,6 @@ package com.ruoyi.app.form; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -34,4 +35,7 @@ public class RegisterForm { @ApiModelProperty("学校证明") private String prove; + + @JsonIgnore + private Integer status; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java index 5d55202..1ba9256 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppRegisterService.java @@ -62,7 +62,7 @@ public interface IAppRegisterService int passAppRegister(Long id); - int rejectAppRegister(Long id); + int rejectAppRegister( AppRegister appRegister); AppRegister selectAppRegisterByphone(String phoneNumber); diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java index d2ae97b..4463145 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java @@ -10,6 +10,7 @@ import com.ruoyi.app.domain.vo.AppRegisterVo; import com.ruoyi.app.mapper.AppSchoolMapper; import com.ruoyi.app.mapper.AppUserMapper; import com.ruoyi.common.core.utils.DateUtils; +import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.bean.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -137,12 +138,15 @@ public class AppRegisterServiceImpl implements IAppRegisterService } @Override - public int rejectAppRegister(Long id) { - AppRegister appRegister = appRegisterMapper.selectAppRegisterById(id); - Assert.isTrue(appRegister != null, "该申请不存在"); - assert appRegister != null; + public int rejectAppRegister(AppRegister appRegister) { + AppRegister register = appRegisterMapper.selectAppRegisterById(appRegister.getId()); + Assert.isTrue(register != null, "该申请不存在"); + assert register != null; Assert.isTrue(appRegister.getStatus() == 0, "该申请已驳回"); - appRegister.setStatus(2); + if (StringUtils.isNotEmpty(appRegister.getRemark())) { + register.setStatus(appRegister.getStatus()); + register.setRemark(appRegister.getRemark()); + } appRegister.setUpdateTime(DateUtils.getNowDate()); return appRegisterMapper.updateAppRegister(appRegister); } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index c155489..fbb77e0 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -171,8 +171,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService AppUserCollect appUserCollect = new AppUserCollect(); appUserCollect.setDynamicId(id); + appUserCollect.setUserId(appUserDynamic.getAppId()); List appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect); - if (CollectionUtils.isNotEmpty(appUserCollects)){ + if (CollectionUtils.isEmpty(appUserCollects)) { appUserDynamicVo.setIsCollect(1); } diff --git a/gan-ui/src/api/app/dynamic.js b/gan-ui/src/api/app/dynamic.js index e32dd81..b69dde9 100644 --- a/gan-ui/src/api/app/dynamic.js +++ b/gan-ui/src/api/app/dynamic.js @@ -1,5 +1,14 @@ import request from '@/utils/request' + +// 查询App用户动态列表 +export function treeDynamic(query) { + return request({ + url: '/app/comment/treeList', + method: 'get', + params: query + }) +} // 查询App用户动态列表 export function listDynamic(query) { return request({ diff --git a/gan-ui/src/api/app/register.js b/gan-ui/src/api/app/register.js index 2917897..b575b56 100644 --- a/gan-ui/src/api/app/register.js +++ b/gan-ui/src/api/app/register.js @@ -17,11 +17,11 @@ export function passRegister(id) { }) } -export function rejectRegister(id) { +export function rejectRegister(data) { return request({ url: '/app/register/reject', - params: { id: id }, - method: 'get' + data: data, + method: 'post' }) } diff --git a/gan-ui/src/views/app/dynamic/detail.vue b/gan-ui/src/views/app/dynamic/detail.vue new file mode 100644 index 0000000..b0dac8d --- /dev/null +++ b/gan-ui/src/views/app/dynamic/detail.vue @@ -0,0 +1,6 @@ + + diff --git a/gan-ui/src/views/app/dynamic/index.vue b/gan-ui/src/views/app/dynamic/index.vue index c509111..814f617 100644 --- a/gan-ui/src/views/app/dynamic/index.vue +++ b/gan-ui/src/views/app/dynamic/index.vue @@ -72,20 +72,36 @@ - + - - - - - - - - - + + + + + + +