提交

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TaUserVerifyServiceImpl.java

@@ -94,12 +94,15 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
             responseBean.addError("审核状态错误！");
             return responseBean;
         }
+        // 设置成用户提交上来的状态结果
+        String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
+        userVerify.setVerifyStatus(status);
 
         // 校验房产
         hasUserVerify(userElement, userVerify, true);
 
         User user = userMapper.selectById(userElement.getId());
-        String status = verifyStatus == true ? Constant.APPROVED : Constant.REJECTED;
+
 
         TaUser taUser = taUserMapper.selectById(userVerify.getUserId());
         TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectCommunityIdAndAddress(userVerify.getCommunityId(), userVerify.getPhaseId(),
@@ -115,7 +118,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         if (Constant.REJECTED.equals(status)) {
             userVerify.setRemark(remark);
         }
-        userVerify.setVerifyStatus(status);
+
         userVerify.setVerifyName(user.getUserName());
         taUserVerifyMapper.updateById(userVerify);
 
@@ -164,7 +167,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     private void hasUserVerify(UserElement userElement, TaUserVerify userVerify, boolean hasOwner){
         TaUserVerify hasUserVerify = null;
         // 校验这个房产有没有业主，只能存在一个业主
-        if (hasOwner && userVerify.getRoleId().intValue() == 1) {
+        if (hasOwner && userVerify.getRoleId().intValue() == 1 && "1".equals(userVerify.getVerifyStatus())) {
             hasUserVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getCommunityId(), userVerify.getPhaseId(),
                     userVerify.getBuildingId(), userVerify.getUnitId(),
                     userVerify.getLevelId(), userVerify.getRoomNoId());
@@ -235,6 +238,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         // 不通过的原因
         userVerify.setRemark(remark);
         userVerify.setRoleId(Integer.valueOf(roleState));
+        userVerify.setVerifyStatus(verifyStatus);
+
         //判断审核数据是否冲突
         hasUserVerify(userElement,  userVerify,  true);
 
@@ -247,8 +252,6 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 userVerify.getLevelId(), userVerify.getRoomNoId(),
                 taUser.getLoginName());
 
-        userVerify.setVerifyStatus(verifyStatus);
-
         // 审核通过的情况
         if ("1".equals(verifyStatus) && StringUtils.isNotBlank(roleState)) {
             // 审核通过就把 不通过的原因拿掉
@@ -263,11 +266,18 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                tpBuildingOwnerInfo.setTaUserVerifyId(userVerify.getId());
                tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
             }
-            // 推送海康
-            ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
-            if (!"0".equals(pushHKPerson.getCode())) {
+
+            try {
+                // 推送海康
+                ResponseBean pushHKPerson = taUserFeignService.pushHKPerson(userVerify.getUserId());
+                if (!"0".equals(pushHKPerson.getCode())) {
+                    throw new WisdomException("设备推送失败！");
+                }
+            } catch (Exception e) {
+                log.info("设备推送失败！，人员id：{}", userVerify.getUserId());
                 throw new WisdomException("设备推送失败！");
             }
+
         }
         taUserVerifyMapper.updateById(userVerify);
         //推送消息