From c90a8ac772937f8f084356ea1f04c5dba1d9e5d5 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期五, 24 一月 2025 11:15:33 +0800 Subject: [PATCH] 12.18 --- ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java index b41500b..13b6d0b 100644 --- a/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java +++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java @@ -1,5 +1,7 @@ package com.ruoyi.auth.service; +import com.ruoyi.other.api.domain.Shop; +import com.ruoyi.other.api.feignClient.ShopClient; import com.ruoyi.system.api.RemoteUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -39,7 +41,8 @@ @Resource private RedisService redisService; - + @Resource + private ShopClient shopClient; /** * 登录 */ @@ -90,8 +93,17 @@ } if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_FAIL_STATUS, "用户已停用,请联系管理员"); -// throw new ServiceException("对不起,您的账号:" + username + " 已停用"); - throw new ServiceException("您的账号已被禁用,请联系平台"); + throw new ServiceException("您所属门店已被冻结,请联系平台"); + } + if (user.getRoleType()==2){ + Shop data = shopClient.getShopById(user.getObjectId()).getData(); + if (data==null){ + throw new ServiceException("门店不存在"); + }else{ + if (data.getStatus()==2){ + throw new ServiceException("您所属门店已被冻结,请联系平台"); + } + } } passwordService.validate(user, password, request); recordLogService.recordLogininfor(request, user.getUserId().intValue(), username, Constants.LOGIN_SUCCESS_STATUS, "登录成功"); -- Gitblit v1.7.1