From 40d8105e550c0dc4881c1b20ef5893404c9b2874 Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 26 Sep 2025 16:23:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(member):=20=E6=94=AF=E6=8C=81=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=B3=A8=E9=94=80=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?-=20=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=B3=A8=E9=94=80?= =?UTF-8?q?=E7=8A=B6=E6=80=81REVOKED=EF=BC=8C=E5=80=BC=E4=B8=BA2-=20?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E8=AE=A4=E8=AF=81=E7=AD=96=E7=95=A5=E4=B8=AD?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=B7=B2=E6=B3=A8=E9=94=80=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=99=BB=E5=BD=95=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/web/service/impl/SmsAuthStrategy.java | 5 ++++- .../dromara/common/core/domain/event/Constants.java | 2 ++ .../java/com/wzj/soopin/member/domain/po/Member.java | 11 ++++++++--- .../soopin/member/service/impl/MemberServiceImpl.java | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java index fc11c8eb4..3cb801b24 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java @@ -156,9 +156,12 @@ public class SmsAuthStrategy implements IAuthStrategy { if (ObjectUtil.isNull(user)) { log.info("登录用户：{} 不存在.", phonenumber); return null; - } else if (SystemConstants.DISABLE.equals(user.getStatus())) { + } else if (org.dromara.common.core.domain.event.Constants.MEMBER_ACCOUNT_STATUS.FORBIDDEN.equals(user.getStatus())) { log.info("登录用户：{} 已被停用.", phonenumber); throw new UserException("user.blocked", phonenumber); + } else if (org.dromara.common.core.domain.event.Constants.MEMBER_ACCOUNT_STATUS.REVOKED.equals(user.getStatus())) { + log.warn("已注销的用户：{} 重新登录", phonenumber); + memberMapper.updateById(Member.builder().id(user.getId()).status(org.dromara.common.core.domain.event.Constants.MEMBER_ACCOUNT_STATUS.NORMAL).build()); } return user; } diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/Constants.java index aeea6d1ac..f30285766 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/Constants.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/Constants.java @@ -160,6 +160,8 @@ public class Constants public static class MEMBER_ACCOUNT_STATUS { public static final Integer FORBIDDEN = 0; public static final Integer NORMAL = 1; + // 注销 + public static final Integer REVOKED = 2; } /** diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java index 93a19b832..87742521d 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/domain/po/Member.java @@ -7,12 +7,12 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.dromara.common.core.domain.event.Constants; import org.dromara.common.core.domain.model.BaseAudit; -import org.dromara.common.excel.annotation.Excel; -import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; + /** * 会员信息对象 ums_member * @@ -47,7 +47,12 @@ public class Member extends BaseAudit { @Schema(description ="用户备注") private String mark; - @Schema(description ="帐号启用状态:0->禁用；1->启用") + + /** + * 帐号启用状态 + * @see Constants.MEMBER_ACCOUNT_STATUS + */ + @Schema(description ="帐号启用状态", implementation = Constants.MEMBER_ACCOUNT_STATUS.class) private Integer status; @Schema(description ="头像") diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java index 8cde2ef07..953132838 100644 --- a/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java +++ b/ruoyi-modules/ruoyi-member/src/main/java/com/wzj/soopin/member/service/impl/MemberServiceImpl.java @@ -406,7 +406,7 @@ public class MemberServiceImpl extends ServiceImpl implemen String phoneNumber = loginUser.getPhoneNumber(); String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phoneNumber); Assert.isTrue(StrUtil.equals(smsCode, code), () -> new ServiceException("短信验证码错误")); - memberMapper.updateById(Member.builder().id(loginUser.getUserId()).status(Constants.MEMBER_ACCOUNT_STATUS.FORBIDDEN).build()); + memberMapper.updateById(Member.builder().id(loginUser.getUserId()).status(Constants.MEMBER_ACCOUNT_STATUS.REVOKED).build()); } @Override