重构用户校验

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/ITaUserService.java

@@ -1,7 +1,9 @@
 package com.community.huiju.service;
 
+import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.TaUser;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -13,8 +15,15 @@ import java.util.List;
  */
 public interface ITaUserService {
 
-    default void checkUser(TaUser user) {
 
+    /**
+     * 校验 用户认证状态
+     * @param user
+     */
+    default void checkVerifyStatusUser(TaUser user) {
+        if (Constant.INVALID_VERIFY_STATUS.equals(user.getVerifyStatus())) {
+            throw new WisdomException("关联账户违反社区规定，无法使用");
+        }
     }
 
     /**

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -100,15 +100,24 @@ public class TaUserServiceImpl implements ITaUserService {
     public ResponseBean login(String loginName,String code) {
         ResponseBean response = new ResponseBean();
 
-        // 校验
+        // 校验手机号和验证码
         iCode.checkPhoneAndCode(loginName, code);
 
         Map<String,Object> map = Maps.newHashMap();
         map.put("loginName",loginName);
         TaUser currentUser = taUserMapper.selectByLoginName(map);
+        if (null == currentUser) {
+            response.addError("未注册，请先注册");
+            return response;
+        }
 
-        TaUserVO taUserVO = new TaUserVO();
+        // 校验用户
+        checkVerifyStatusUser(currentUser);
 
+        // 查询房产
+        
+
+        TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(currentUser, taUserVO);
         response.addSuccess(taUserVO);
         return response;

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -17,9 +17,11 @@ public class Constant {
     public static final String WEB_USER_SESSION = "webUser";
 
     /** WEB运营端session **/
+    @Deprecated
     public static final String WEB_OPERATE_USER_SESSION = "webOperateUser";
 
     /** WEB物业端session **/
+    @Deprecated
     public static final String WEB_PROPERTY_USER_SESSION = "webPropertyUser";
 
     /** 不需要权限的URL身份 **/
@@ -197,4 +199,9 @@ public class Constant {
      * 已认证
      */
     public static final String VERIFY_STATUS = "1";
+
+    /**
+     * 认证作废
+     */
+    public static final String INVALID_VERIFY_STATUS = "3";
 }