修改文案

src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java

@@ -637,9 +637,12 @@ public class UserController implements IBaseController {
     private JsonResult loginWithUserId(Long channelId, String appChannel, Long createdFrom, String userId, Merchant merchant, String dimension, HttpServletRequest request) {
         //查询用户
         User user = userService.findByUuidInDb(userId);
-        if (Objects.isNull(user) || UserStatusEnum.isDisable(user).getKey()) {
-            log.error("用户不存在，或者已经冻结注销，userId:{}", userId);
-            return JsonResult.buildErrorStateResult("登录失败", null);
+        if (Objects.isNull(user)) {
+            log.error("用户不存在，userId:{}", userId);
+            return JsonResult.buildErrorStateResult("登录失败, 用户不存在", null);
+        } else if (UserStatusEnum.isDisable(user).getKey()) {
+            log.error("用户已冻结或注销，userId:{}", userId);
+            return UserStatusEnum.isDisable(user).getValue();
         } else if (!wechatRelateUserIfNecessary(user, request)) {
             return JsonResult.buildErrorStateResult("登录时微信关联失败", null);
         }

src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java

@@ -101,7 +101,7 @@ public class AppController implements IBaseController {
                 if (user == null) {
                     result = JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
                 } else if (UserStatusEnum.isDisable(user).getKey()) {
-                    result = JsonResult.buildErrorStateResult("登录失败", null);
+                    result = UserStatusEnum.isDisable(user).getValue();
                 } else {
                     Merchant merchant = merchantService.findMerchantByName(key);
                     if (merchant == null) {
@@ -235,7 +235,7 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
         }
         if (UserStatusEnum.isDisable(user).getKey()) {
-            return JsonResult.buildErrorStateResult("登录失败", null);
+            return UserStatusEnum.isDisable(user).getValue();
         }
         Merchant merchant = merchantService.findMerchantByName(key);
         if (merchant == null) {
@@ -339,7 +339,7 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult(USER_ERROR_OR_PASSWORD_ERROR, null);
         }
         if (UserStatusEnum.isDisable(user).getKey()) {
-            return JsonResult.buildErrorStateResult("登录失败", null);
+            return UserStatusEnum.isDisable(user).getValue();
         }
         //校验租户ID tenantId
         oauthLoginInfoService.addLoginInfo(user, tenantId);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/InnerController.java

@@ -1349,6 +1349,9 @@ public class InnerController implements IBaseController {
         if (user == null) {
             return JsonResult.buildErrorStateResult("用户名或密码不正确", null);
         }
+        if (UserStatusEnum.isDisable(user).getKey()) {
+            return UserStatusEnum.isDisable(user).getValue();
+        }
         UserRet model = new UserRet(user);
         return JsonResult.buildSuccessResult("校验成功", model);
     }

src/main/java/cn/quantgroup/xyqb/controller/middleoffice/login/LoginModule.java

@@ -48,7 +48,7 @@ public class LoginModule implements ILoginModule {
         }
         if (UserStatusEnum.isDisable(user).getKey()) {
             log.info("用户尝试登录，已冻结或注销:{}", phoneNo);
-            throw new DataException("用户已冻结或销户");
+            throw new DataException(UserStatusEnum.isDisable(user).getValue().getMsg());
         }
 
         //验证
@@ -87,6 +87,10 @@ public class LoginModule implements ILoginModule {
         if(null == user){
           throw new DataException("未找到此用户");
         }
+        /* 新增冻结销户拦截 */
+        if (UserStatusEnum.isDisable(user).getKey()) {
+            throw new DataException(UserStatusEnum.isDisable(user).getValue().getMsg());
+        }
         LoginProperties loginProperties = LoginProperties.builder()
                 .createdFrom(user.getRegisteredFrom())
                 .appChannel(appChannel == null ? "" : appChannel)

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -342,7 +342,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         /* 用户已冻结或销户 */
         if (user != null && UserStatusEnum.isDisable(user).getKey()) {
             log.info("用户已经冻结或销户, 登录失败, phoneNo:{}", phoneNo);
-            return JsonResult.buildErrorStateResult("登录失败", null);
+            return UserStatusEnum.isDisable(user).getValue();
         }
         if (user == null) {
             // Service层会负责发送注册消息到LoanVest