Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.property.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -224,15 +225,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
             return responseBean;
         }
 
-        TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
+//        TaUser appUser = getByLoginName(tpBuildingOwnerInfo.getOwnerTel());
 
-        TaUser taUser =null;
+//        TaUser taUser =null;
         // 开始匹配 APP 端用户表
-        if (null == appUser) {
+//        if (null == appUser) {
             // 如果 APP端 没有这个用户，则自动注册一个
-            taUser = new TaUser();
-            taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
-            taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
+//            taUser = new TaUser();
+//            taUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+//            taUser.setLoginName(tpBuildingOwnerInfo.getOwnerTel());
 //            taUser.setGender(tpBuildingOwnerInfo.getGender());
 //            taUser.setStatus("1");
 //            taUser.setRemark("系统自动注册！");
@@ -240,14 +241,14 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 //            taUser.setVerifyStatus("1");
 ////            taUserMapper.insert(taUser);
 //            taUser.setCreateUser(taUser.getId());
-            taUser.setCreateDate(LocalDateTime.now());
+//            taUser.setCreateDate(LocalDateTime.now());
 //            taUserMapper.updateById(taUser);
-            appUser = taUser;
-        }
+//            appUser = taUser;
+//        }
 
         // 设置 用户性别 和 用户姓名
 //        tpBuildingOwnerInfo.setGender(appUser.getGender());
-        tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
+//        tpBuildingOwnerInfo.setOwnerName(appUser.getUserName());
 
         // 插入楼栋资料库
         tpBuildingOwnerInfo = insertTpBuildingOwnerInfo(tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(),
@@ -255,8 +256,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                 tpBuildingOwnerInfo.getGender(), tpBuildingOwnerInfo.getOwnerName(), tpBuildingOwnerInfo.getOwnerTel());
 
         // 更新 APP 端用户姓名
-        appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
-        appUser.setCreateDate(LocalDateTime.now());
+//        appUser.setUserName(tpBuildingOwnerInfo.getOwnerName());
+//        appUser.setCreateDate(LocalDateTime.now());
 //        appUser.setCreateUser(appUser.getId());
 
 //        int row = taUserMapper.updateById(appUser);
@@ -269,70 +270,70 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         // 认证状态  0 是未认证    1是认证通过   2是已作废
         tpBuildingOwnerInfo.setVerifyStatus("1");
         // 关联状态   0 未关联  1 是已关联
-        tpBuildingOwnerInfo.setPairStatus("1");
-//        row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
-//        if (row <= 0) {
-//            log.error("添加操作! 更新 楼栋业主信息表 的认证,关联状态 失败!");
-//            throw new WisdomException("操作失败!");
-//        }
+        tpBuildingOwnerInfo.setPairStatus("0");
+        int row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
+        if (row <= 0) {
+            log.error("添加操作! 更新 楼栋业主信息表 的认证,关联状态 失败!");
+            throw new WisdomException("操作失败!");
+        }
 
         // 根据 小区id 、 小区、期、栋、单元、楼层、户号 进行条件查询出 已审核通过的并且是业主
-        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(), tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
-        if (null != userVerify && roleId.intValue() == 1) {
-            responseBean.addSuccess("已存在业主！");
-            return responseBean;
-        }
+//        TaUserVerify userVerify = taUserVerifyMapper.selectCommunityAndAddress(userElement.getOrgId(), tpBuildingOwnerInfo.getPhaseId(), tpBuildingOwnerInfo.getBuildingId(), tpBuildingOwnerInfo.getUnitId(), tpBuildingOwnerInfo.getLevelId(), tpBuildingOwnerInfo.getRoomNoId());
+//        if (null != userVerify && roleId.intValue() == 1) {
+//            responseBean.addSuccess("已存在业主！");
+//            return responseBean;
+//        }
 
         // 审核表中插入一条数据, 审核已通过，并且是业主角色
-        TaUserVerify taUserVerify = new TaUserVerify();
+//        TaUserVerify taUserVerify = new TaUserVerify();
 //        taUserVerify.setUserId(appUser.getId());
-        taUserVerify.setOrgId(userElement.getOrgId());
-        taUserVerify.setRoleId(roleId);
-        taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
-        taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
-        taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
-        taUserVerify.setBuildingName(tpBuildingOwnerInfo.getBuildingName());
-        taUserVerify.setUnitId(tpBuildingOwnerInfo.getUnitId());
-        taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
-        taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
-        taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
-        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getRoomNoId());
-        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getRoomNoName());
+//        taUserVerify.setOrgId(userElement.getOrgId());
+//        taUserVerify.setRoleId(roleId);
+//        taUserVerify.setPhaseId(tpBuildingOwnerInfo.getPhaseId());
+//        taUserVerify.setPhaseName(tpBuildingOwnerInfo.getPhaseName());
+//        taUserVerify.setBuildingId(tpBuildingOwnerInfo.getBuildingId());
+//        taUserVerify.setBuildingName(tpBuildingOwnerInfo.getBuildingName());
+//        taUserVerify.setUnitId(tpBuildingOwnerInfo.getUnitId());
+//        taUserVerify.setUnitName(tpBuildingOwnerInfo.getUnitName());
+//        taUserVerify.setLevelId(tpBuildingOwnerInfo.getLevelId());
+//        taUserVerify.setLevelName(tpBuildingOwnerInfo.getLevelName());
+//        taUserVerify.setRoomNoId(tpBuildingOwnerInfo.getRoomNoId());
+//        taUserVerify.setRoomNoName(tpBuildingOwnerInfo.getRoomNoName());
         // 审核通过
-        taUserVerify.setVerifyStatus("1");
-        taUserVerify.setCreateDate(LocalDateTime.now());
-        taUserVerify.setVerifyName(user.getUserName());
+//        taUserVerify.setVerifyStatus("1");
+//        taUserVerify.setCreateDate(LocalDateTime.now());
+//        taUserVerify.setVerifyName(user.getUserName());
 //        row = taUserVerifyMapper.insert(taUserVerify);
 
-        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
+//        tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
 //        row = tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
         //推送消息
-        String[] messageArr= new messagePush().messagePushAll( );
-        for (String count : messageArr) {
-            Message message = new Message();
-            message.setOrgId(taUserVerify.getOrgId());
-            message.setMessageType("9");
-            message.setAdviceType("1");
-            message.setModelType("1");
-            message.setUuid(taUserVerify.getId().toString());
-            message.setUuidType("1");
-            message.setSource("1");
-            message.setMessageContent(count);
-            message.setStatus("1");
-            message.setResult("");
-            message.setMeaasgeTypeId("");
-            message.setReadStatus("0");
-            message.setCreateUser(userElement.getUserId().toString());
-            message.setCreateDate(LocalDateTime.now());
-            messageMapper.insert(message);
-        }
-
-        try {
+//        String[] messageArr= new messagePush().messagePushAll( );
+//        for (String count : messageArr) {
+//            Message message = new Message();
+//            message.setOrgId(taUserVerify.getOrgId());
+//            message.setMessageType("9");
+//            message.setAdviceType("1");
+//            message.setModelType("1");
+//            message.setUuid(taUserVerify.getId().toString());
+//            message.setUuidType("1");
+//            message.setSource("1");
+//            message.setMessageContent(count);
+//            message.setStatus("1");
+//            message.setResult("");
+//            message.setMeaasgeTypeId("");
+//            message.setReadStatus("0");
+//            message.setCreateUser(userElement.getUserId().toString());
+//            message.setCreateDate(LocalDateTime.now());
+//            messageMapper.insert(message);
+//        }
 
-        } catch (Exception e) {
-            log.info("设备推送失败！，人员id：{}", userVerify.getPersonId());
-            throw new WisdomException("设备推送失败！");
-        }
+//        try {
+//
+//        } catch (Exception e) {
+//            log.info("设备推送失败！，人员id：{}", userVerify.getPersonId());
+//            throw new WisdomException("设备推送失败！");
+//        }
 
 //        if (row <= 0) {
 //            throw new WisdomException("操作失败!");
@@ -450,12 +451,16 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         ResponseBean responseBean = new ResponseBean();
         responseBean = getExcelData(file);
 
+        if (responseBean.getCode() != 1000){
+            return responseBean;
+        }
         //获取要上传的数据
         Map<String,Object> map = (Map<String, Object>) responseBean.getData();
         List<TpBuildingOwnerInfo> list = (List<TpBuildingOwnerInfo>) map.get("list");
         
         //批量插入
         list.forEach(e -> {
+            // 校验是否存在重复房源
             e.setOrgId(userElement.getOrgId());
             e.setVerifyStatus("0");
             e.setPairStatus("0");
@@ -711,7 +716,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
                     responseBean.addError("第" + currentRow + "行" + "身份不能为空!");
                     return responseBean;
                 }
-    
+                LambdaQueryWrapper<TpBuildingOwnerInfo> ownerInfoQueryWrapper = new LambdaQueryWrapper<>();
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getOwnerTel,ownerTel);
+                ownerInfoQueryWrapper.eq(TpBuildingOwnerInfo::getRoomNoId,roomNoId);
+                TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(ownerInfoQueryWrapper);
+                if (null != tpBuildingOwnerInfo){
+                    responseBean.addError("第" + currentRow + "行" + "户主已存在!");
+                    return responseBean;
+                }
+
 //                if (temBuildingList.contains(roomNoId)){
 //                    logger.info("存在重复房源:{}",roomNoId);
 //                    responseBean.addError("第"+ currentRow +"行存在重复房源");
@@ -864,13 +877,13 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         ResponseBean responseBean = new ResponseBean();
         ids.stream().forEach(e->{
-            QueryWrapper<TpBuildingOwnerInfo> buildingOwnerInfoQueryWrapper = new QueryWrapper<>();
-            buildingOwnerInfoQueryWrapper.eq("ta_user_verify_id", e);
-            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectOne(buildingOwnerInfoQueryWrapper);
+            TpBuildingOwnerInfo tpBuildingOwnerInfo = tpBuildingOwnerInfoMapper.selectById(e);
             if (null != tpBuildingOwnerInfo) {
                 tpBuildingOwnerInfoMapper.deleteById(tpBuildingOwnerInfo.getId());
             }
-            taUserVerifyMapper.deleteById(e);
+            if (null != tpBuildingOwnerInfo.getTaUserVerifyId()){
+                taUserVerifyMapper.deleteById(tpBuildingOwnerInfo.getTaUserVerifyId());
+            }
 
             // 作废话题
 //            tpTransactionMapper.invalidByUuidAndUuidType(e, "app");

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -314,12 +314,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         taUserVerify.setLoginName(currentUser.getName());
 
         // 开始查询 业主
-        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
-        if (null != userVerify) {
-            TaUser taUser = taUserMapper.selectById(userVerify.getPersonId());
-            taUserVerify.setOwnerName(taUser.getUserName());
-        }
-
+//        TaUserVerify userVerify = taUserVerifyMapper.selectWxCommunityAndAddressAndRoleId(taUserVerify.getOrgId(), taUserVerify.getPhaseId(), taUserVerify.getBuildingId(), taUserVerify.getUnitId(), taUserVerify.getLevelId(), taUserVerify.getRoomNoId());
         responseBean.addSuccess(taUserVerify);
         return responseBean;
     }
@@ -404,7 +399,7 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
                 tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
                 tpBuildingOwnerInfo.setCreateUser(-1);
                 tpBuildingOwnerInfo.setTaUserVerifyId(taUserVerify.getId());
-                tpBuildingOwnerInfoMapper.insert(tpBuildingOwnerInfo);
+                tpBuildingOwnerInfoMapper.updateById(tpBuildingOwnerInfo);
 
                 taUserVerify.setVerifyStatus("1");
                 taUserVerify.setVerifyName("自动审核通过");