From 0fb3a76c8f7c161daeee597075ef1dfebc67badc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 25 Jul 2024 11:20:50 +0800
Subject: [PATCH] 后台

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index d0c47dd..fcd196b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -94,6 +94,12 @@
          * 生成用户信息
          * 返回账号和密钥给前端
          */
+        String passwordAgain = registerDto.getPasswordAgain();
+        String password = registerDto.getPassword();
+        if(!passwordAgain.equals(password)){
+            throw new FebsException("两次密码不一致。");
+        }
+
         String accountLogin = registerDto.getAccountLogin();
         boolean isValid = validateAccount(accountLogin);
         if(!isValid){
@@ -179,8 +185,8 @@
         if (mallMember == null) {
             throw new FebsException("账号或密码错误");
         }
-        if (MallMember.ACCOUNT_STATUS_DISABLED.equals(mallMember.getAccountStatus())) {
-            throw new FebsException("账号限制登录");
+        if (ProductEnum.MEMBER_FROZEN.getValue() == mallMember.getIsFrozen()) {
+            throw new FebsException("账号已冻结");
         }
 
         String redisKey = AppContants.APP_LOGIN_PREFIX + mallMember.getId();
@@ -230,7 +236,15 @@
     @Override
     public FebsResponse logout() {
         Long id = LoginUserUtil.getLoginUser().getId();
-        redisUtils.del(AppContants.APP_LOGIN_PREFIX + id);
+
+        String redisKey = AppContants.APP_LOGIN_PREFIX + id;
+        String existToken = redisUtils.getString(redisKey);
+        if (StrUtil.isNotBlank(existToken)) {
+            Object o = redisUtils.get(existToken);
+            if (ObjectUtil.isNotEmpty(o)) {
+                redisUtils.del(existToken);
+            }
+        }
         return new FebsResponse().success().message("退出登录");
     }
 

--
Gitblit v1.9.1