切换房产

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -67,6 +67,24 @@ public class UserController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "登录 绑定 房产", notes = "绑定选中的当前房产，进行登录 (在APP登录后，选择房产的时候)，还可以用于切换房产登录")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "path",dataTypeClass = String.class, name = "userVerifyId",value = "审核 id"),
+            @ApiImplicitParam(paramType = "header",dataTypeClass = String.class, name = "X-Auth-Token",value = "Token")
+    })
+    @RequestMapping(value = "/user/binding/login/{userVerifyId}",method = RequestMethod.POST)
+    public ResponseBean login(@PathVariable("userVerifyId") Integer userVerifyId,
+                              HttpSession session){
+        UserElement userElement = getUserElement(session);
+        ResponseBean responseBean = iTaUserService.bindingLoginAndHouse(userElement, userVerifyId);
+        TaUserVO userVO = (TaUserVO) responseBean.getData();
+        if (null != userVO) {
+            setUserElement(userVO, session);
+        }
+        return responseBean;
+
+    }
+
     @ApiOperation(value = "修改手机号", notes = "修改手机号")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "paramets",value = "phone：登陆(手机号)，code：(手机验证码),otherUserId:(租客或者家属ID，空为业主本人)"),

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/UserVerifyController.java

@@ -73,12 +73,12 @@ public class UserVerifyController extends BaseController {
     public ResponseBean deleteCurrentUserVerify(@PathVariable("userVerifyId") Integer userVerifyId, HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = taUserVerifyServicel.deleteCurrentUserVserify(userElement, userVerifyId);
+        responseBean = taUserVerifyServicel.deleteCurrentUserVerify(userElement, userVerifyId);
         return responseBean;
     }
 
     @RequestMapping(value = "/user/verify/list", method = RequestMethod.GET)
-    @ApiOperation(value = "获取 当前用户关联的房产", notes = "获取 当前用户关联的房产")
+    @ApiOperation(value = "获取 当前用户关联的房产列表", notes = "获取 当前用户关联的房产列表")
     public ResponseBean getByCurrentUser(HttpSession session) {
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);

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

@@ -129,4 +129,11 @@ public interface ITaUserService {
      */
     ResponseBean addWelcomeUser(UserElement userElement,TaUser user);
 
+    /**
+     * 绑定选中的当前房产，进行登录 (在APP登录后，选择房产的时候), 还可以用于切换房产登录
+     * @param userElement
+     * @param userVerifyId
+     * @return
+     */
+    ResponseBean bindingLoginAndHouse(UserElement userElement, Integer userVerifyId);
 }

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

@@ -45,6 +45,6 @@ public interface TaUserVerifyServicel {
      * @param userVerifyId
      * @return
      */
-    ResponseBean deleteCurrentUserVserify(UserElement userElement, Integer userVerifyId);
+    ResponseBean deleteCurrentUserVerify(UserElement userElement, Integer userVerifyId);
 
 }

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

@@ -91,8 +91,6 @@ public class SocialServiceImpl implements SocialServiceI {
     @Autowired
     private  TpTransactionLikeMapper tpTransactionLikeMapper;
 
-    @Autowired
-    private  TpActivitySignupMapper tpActivitySignupMapper;
 
     @Override
     @Transactional

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

@@ -136,27 +136,7 @@ public class TaUserServiceImpl implements ITaUserService {
              * 登陆成功后这个 审核id 会存 session
              */
 
-            // 设置 这个审核id （这个要返给前端）
-            taUserVO.setUserVerifyId(userVerify.getId());
-
-            // 认证状态  0 是未审核   1是审核通过   2是审核不通过
-            String verifyStatus = userVerify.getVerifyStatus();
-            // 有一个审核通过的房产
-            if ("1".equals(verifyStatus)) {
-                // 设置 userVO 信息
-                setUserVoProperties(userVerify.getCommunityId(), taUserVO);
-
-                taUserVO.setAddressBuilding(userVerify.getPhase() + userVerify.getBuilding() + userVerify.getUnit() + userVerify.getLevel() + userVerify.getRoomNo());
-                TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
-                taUserVO.setRole(taSysRole.getRoleName());
-
-                response.addSuccess(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode(),taUserVO);
-                return response;
-            }
-            String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
-                                "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
-            response.addSuccess(resultCode, taUserVO);
-            return response;
+            return checkHouse(response, taUserVO, userVerify);
         } else if (taUserVerifies.size() >= 2) {
             BeanUtils.copyProperties(currentUser, taUserVO);
             response.addSuccess(UserVerifyEnum.A_MULTIPLE_REAL_ESTATE.getCode(), taUserVO);
@@ -979,4 +959,50 @@ public class TaUserServiceImpl implements ITaUserService {
         return responseBean;
     }
 
+    @Override
+    public ResponseBean bindingLoginAndHouse(UserElement userElement, Integer userVerifyId) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUserVO taUserVO = new TaUserVO();
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
+        if (null != userVerify) {
+            if (userElement.getId().intValue() != userVerify.getUserId().intValue()) {
+                throw new WisdomException("您未绑定该房产！");
+            }
+            TaUser currentUser = taUserMapper.selectByPrimaryKey(userElement.getId());
+            BeanUtils.copyProperties(currentUser, taUserVO);
+            return checkHouse(responseBean, taUserVO, userVerify);
+        }
+        throw new WisdomException("该房产不存在！");
+    }
+
+    /**
+     * 校验 房产的状态
+     * @param responseBean
+     * @param taUserVO
+     * @param userVerify
+     * @return
+     */
+    private ResponseBean checkHouse(ResponseBean responseBean, TaUserVO taUserVO, TaUserVerify userVerify) {
+        // 设置 这个审核id （这个要返给前端）
+        taUserVO.setUserVerifyId(userVerify.getId());
+
+        // 认证状态  0 是未审核   1是审核通过   2是审核不通过
+        String verifyStatus = userVerify.getVerifyStatus();
+        // 有一个审核通过的房产
+        if ("1".equals(verifyStatus)) {
+            // 设置 userVO 信息
+            setUserVoProperties(userVerify.getCommunityId(), taUserVO);
+
+            taUserVO.setAddressBuilding(userVerify.getPhase() + userVerify.getBuilding() + userVerify.getUnit() + userVerify.getLevel() + userVerify.getRoomNo());
+            TaSysRole taSysRole = taSysRoleMapper.selectByPrimaryKey(userVerify.getRoleId());
+            taUserVO.setRole(taSysRole.getRoleName());
+
+            responseBean.addSuccess(UserVerifyEnum.A_AUDIT_REAL_ESTATE.getCode(),taUserVO);
+            return responseBean;
+        }
+        String resultCode = "0".equals(verifyStatus) ? UserVerifyEnum.A_TO_AUDIT_REAL_ESTATE.getCode() :
+                "2".equals(verifyStatus) ? UserVerifyEnum.A_AUDIT_FAILED_REAL_ESTATE.getCode() : "500";
+        responseBean.addSuccess(resultCode, taUserVO);
+        return responseBean;
+    }
 }

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

@@ -36,9 +36,6 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     @Autowired
     private TpBuildingOwnerInfoMapper tpBuildingOwnerInfoMapper;
 
-    @Autowired
-    private TaSysRoleMapper taSysRoleMapper;
-
     @Autowired
     private SysNationMapper sysNationMapper;
 
@@ -140,7 +137,7 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
     }
 
     @Override
-    public ResponseBean deleteCurrentUserVserify(UserElement userElement, Integer userVerifyId) {
+    public ResponseBean deleteCurrentUserVerify(UserElement userElement, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
 
         TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);