修复 删除楼栋资料 已认证和未认证, 修改 APP端手机号的时候同步楼栋资料

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

@@ -309,6 +309,27 @@ public class TaUserServiceImpl implements ITaUserService {
             taUserMapper.updateLongName(taUser);
             response.addSuccess("修改成功");
             AppkeyCache.setCache(user.getLoginName(),"null");
+
+
+            /**
+             * 如果是家属或者租客,修改手机号, 就不允许修改资料库的信息
+             */
+
+            // 修改楼栋信息资料库的手机号
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("communityId", user.getCommunityId());
+            map.put("userId", userId);
+            TaSysUserRole taSysUserRole = taSysUserRoleMapper.selectByCommunityIdAndUserId(map);
+            // 1 业主 2 租客 3 家属
+            // 只允许业主修改
+            if (taSysUserRole.getRoleId().intValue() == 1) {
+                // TODO 后期可能会有一个业主对应多个小区, 也就是会有多个资料, 具体看需求
+                // TODO 目前是一对一
+                TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectByPrimaryKey(user.getBuildingOwnerInfoId());
+                buildingOwnerInfo.setOwnerTel(phone);
+                tpBuildingOwnerInfoMapper.updateByPrimaryKeySelective(buildingOwnerInfo);
+            }
+
             return response;
         }else {
             response.addError("验证码错误或电话号码错误");

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

@@ -55,7 +55,7 @@ public class UserController extends BaseController {
 	@ApiImplicitParams({
 			@ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "loginName手机号;code验证码;communityId小区Id")
 	})
-	@RequestMapping(value = "/user/login")
+	@RequestMapping(value = "/user/login", method = RequestMethod.POST)
 	public ResponseBean login(@RequestBody String parameter, HttpSession session){
 		ResponseBean responseBean = new ResponseBean();
 		JSONObject jsonObject = JSONObject.parseObject(parameter);

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

@@ -580,51 +580,73 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         return responseBean;
     }
 
+//    @Override
+//    @Transactional(rollbackFor = Exception.class)
+//    @Deprecated
+//    public ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId) {
+//
+//        ResponseBean responseBean = new ResponseBean();
+//
+//        List<TpBuildingOwnerInfo> infoList = ids.stream().map(e->{
+//            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
+//            tpBuildingOwnerInfo.setId(e);
+//            tpBuildingOwnerInfo.setVerifyStatus("2");
+//            tpBuildingOwnerInfo.setUpdateUser(propertyUserId);
+//            tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
+//            return tpBuildingOwnerInfo;
+//        }).collect(Collectors.toList());
+//        boolean result = updateBatchById(infoList);
+//
+//        // APP 端用户
+//        List<TaUser> taUserList = Lists.newArrayList();
+//
+//        ids.forEach(e-> {
+//            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
+//            if (null != tpBuildingOwnerInfo) {
+//                // 查询 APP 端业主
+//                TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
+//                if (null != appOwnerUser) {
+//                    appOwnerUser.setVerifyStatus(2+"");
+//                    appOwnerUser.setUpdateDate(LocalDateTime.now());
+//                    taUserList.add(appOwnerUser);
+//                }
+//
+//            }
+//        });
+//
+//        if (null != taUserList && taUserList.size() > 0) {
+//            result = iTaUserService.updateBatchById(taUserList);
+//        }
+//
+//
+//        if (result) {
+//            responseBean.addSuccess("操作成功!");
+//        }else {
+//            responseBean.addError("操作失败!");
+//        }
+//
+//
+//        return responseBean;
+//    }
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean deleteIds(List<Integer> ids, Integer propertyUserId) {
 
         ResponseBean responseBean = new ResponseBean();
-
-        List<TpBuildingOwnerInfo> infoList = ids.stream().map(e->{
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = new TpBuildingOwnerInfo();
-            tpBuildingOwnerInfo.setId(e);
-            tpBuildingOwnerInfo.setVerifyStatus("2");
-            tpBuildingOwnerInfo.setUpdateUser(propertyUserId);
-            tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
-            return tpBuildingOwnerInfo;
-        }).collect(Collectors.toList());
-        boolean result = updateBatchById(infoList);
-
-        // APP 端用户
-        List<TaUser> taUserList = Lists.newArrayList();
-
-        ids.forEach(e-> {
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
-            if (null != tpBuildingOwnerInfo) {
-                // 查询 APP 端业主
-                TaUser appOwnerUser = getByIdAndCommunityId(tpBuildingOwnerInfo.getOwnerTel(), tpBuildingOwnerInfo.getCommunityId());
-                if (null != appOwnerUser) {
-                    appOwnerUser.setVerifyStatus(2+"");
-                    appOwnerUser.setUpdateDate(LocalDateTime.now());
-                    taUserList.add(appOwnerUser);
-                }
-
+        ids.stream().forEach(e->{
+            TpBuildingOwnerInfo buildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
+            if ("1".equals(buildingOwnerInfo.getVerifyStatus())) {
+                throw new WisdomException("不能删除已认证的楼栋资料!");
+                /**
+                 * 批量删除的时候,只要存在一个已认证的楼栋资料, 就停止删除!
+                 */
             }
+            tpBuildingOwnerInfoMapper.deleteById(buildingOwnerInfo.getId());
         });
 
-        if (null != taUserList && taUserList.size() > 0) {
-            result = iTaUserService.updateBatchById(taUserList);
-        }
-
-
-        if (result) {
-            responseBean.addSuccess("操作成功!");
-        }else {
-            responseBean.addError("操作失败!");
-        }
-
-
+        responseBean.addSuccess("操作成功!");
         return responseBean;
     }