diff --git a/src/main/java/com/kiisoo/ic/constants/Constants.java b/src/main/java/com/kiisoo/ic/constants/Constants.java index 02dcde4..c7259dd 100644 --- a/src/main/java/com/kiisoo/ic/constants/Constants.java +++ b/src/main/java/com/kiisoo/ic/constants/Constants.java @@ -55,6 +55,11 @@ public class Constants { */ public static final String ERROR_USER_NO_PERMISSION = "0009"; + /** + * 该账号已暂停,请联系店长 + */ + public static final String ERROR_ACCOUNT_STOP = "0011"; + /** * 该账号不存在 */ diff --git a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java index de8a3a6..d05aa96 100644 --- a/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/login/service/impl/LoginServiceImpl.java @@ -16,6 +16,7 @@ import com.kiisoo.ic.system.enums.AccountEnum; import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper; import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; +import com.kiisoo.ic.system.service.PrivilageAccountService; import com.kiisoo.ic.wx.service.QWMailListManageService; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.common.error.WxErrorException; @@ -68,6 +69,12 @@ public class LoginServiceImpl implements LoginService { */ private final PoiStoreStaffDOMapper poiStoreStaffDOMapper; + /** + * 账号service + */ + @Autowired + private PrivilageAccountService privilageAccountService; + @Autowired public LoginServiceImpl(PrivilageAccountDOMapper privilageAccountDOMapper, PrivilageUserDOMapper privilageUserDOMapper, PrivilageRoleDOMapper privilageRoleDOMapper, QWMailListManageService qwMailListManageService, @@ -225,6 +232,13 @@ public class LoginServiceImpl implements LoginService { return new LoginBean(Constants.ERROR_USER_NO_PERMISSION); } + PrivilageAccountDO result = privilageAccountService.getAccountByUserId(userId); + + // 该账号已暂停,请联系店长 + if(null != result && result.getStatus().equals(2)){ + return new LoginBean(com.kiisoo.ic.constants.Constants.ERROR_ACCOUNT_STOP); + } + PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId); Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId); Map loginInfoMap = new HashMap<>(); diff --git a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java index ec353af..b7ab5d6 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java +++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java @@ -11,10 +11,12 @@ import com.kiisoo.ic.store.entity.StoreUserDTO; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.service.StoreEmployeeService; +import com.kiisoo.ic.system.entity.PrivilageAccountDO; import com.kiisoo.ic.system.entity.PrivilageRoleDO; import com.kiisoo.ic.system.entity.PrivilageUserDO; import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; +import com.kiisoo.ic.system.service.PrivilageAccountService; import com.kiisoo.ic.webappmy.service.WebAppService; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import com.kiisoo.ic.webappmy.vo.UserParam; @@ -70,6 +72,12 @@ public class WebAppMyController extends BaseController { @Autowired private PrivilageRoleDOMapper privilageRoleDOMapper; + /** + * 账号service + */ + @Autowired + private PrivilageAccountService privilageAccountService; + /** * 获取用户信息 */ @@ -85,6 +93,13 @@ public class WebAppMyController extends BaseController { return fail(com.kiisoo.ic.constants.Constants.ERROR_USER_NO_PERMISSION); } + PrivilageAccountDO result = privilageAccountService.getAccountByUserId(userId); + + // 该账号已暂停,请联系店长 + if(null != result && result.getStatus().equals(2)){ + return fail(com.kiisoo.ic.constants.Constants.ERROR_ACCOUNT_STOP); + } + PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId); Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId); info.get(0).setRoleCode(roleDO.getCode());