From 39cb2329f5b215fb5788c2f43530f766ddf5be7a Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Thu, 23 Jun 2022 15:48:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=9B=E5=87=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 3a01487589..9172544598 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2611,32 +2611,24 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     public void bindHome(BindHomeFormDTO form) {
         // 根据idCard获取ca_redident表的数据
-        if (StringUtils.isBlank(form.getIdCard())) {
-            throw new RenException("身份证号不能为空");
-        }
         GetResidentDetailByIdCardFormDTO dto = new GetResidentDetailByIdCardFormDTO();
         dto.setIdCard(form.getIdCard());
         Result<ResidentByIdCardResultDTO> result = guardarDatosFeignClient.getResidentDetailByIdCard(dto);
         ResidentByIdCardResultDTO residentDetailByIdCard = result.getData();
-        if (org.springframework.util.StringUtils.isEmpty(residentDetailByIdCard)) {
-            throw new RenException("获取不到人的信息");
-        }
-        // 根据房屋id获取房屋信息
-        if (StringUtils.isBlank(form.getHomeId())) {
-            throw new RenException("房屋id不能为空");
+        if(!result.success() || residentDetailByIdCard == null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民信息失败", "获取居民信息失败");
         }
         HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(form.getCustomerId(), form.getHomeId());
-        if (org.springframework.util.StringUtils.isEmpty(houseInfo)) {
-            throw new RenException("获取不到房屋信息");
+        if(houseInfo == null){
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取房屋信息失败", "获取房屋信息失败");
         }
         // 将人的信息放入ic_resi_user对象中
         IcResiUserEntity entity = new IcResiUserEntity();
         entity.setCustomerId(form.getCustomerId());
         // 进行日期转换
         if(residentDetailByIdCard.getBirthday() == null){
-            throw new RenException("出生日期为空");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取出生日期失败", "获取出生日期失败");
         }
-        Date d = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String birthday = sdf.format(residentDetailByIdCard.getBirthday());
 
@@ -2649,7 +2641,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             entity.setMobile(residentDetailByIdCard.getTelephone());
             entity.setBirthday(birthday);
         } else {
-            throw new RenException("人信息不全");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民信息不完整", "居民信息不完整");
         }
         // 将房屋的信息放入ic_resi_user对象中
         if (StringUtils.isNotBlank(houseInfo.getHomeId())
@@ -2666,7 +2658,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             entity.setGridId(resultDTOResult.getData().getGridId());
             entity.setPids(resultDTOResult.getData().getPids());
         } else {
-            throw new RenException("房屋信息不全");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "房屋信息不完整", "房屋信息不完整");
         }
         SaveCaResidentUserFormDTO saveForm = new SaveCaResidentUserFormDTO();
         saveForm.setHomeId(form.getHomeId());
@@ -2675,14 +2667,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
            String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
            baseDao.updateIcResiUserByIdCard(entity);
            saveForm.setIcResiUserId(id);
-           guardarDatosFeignClient.saveCaResidentUser(saveForm);
         } else {
             baseDao.insert(entity);
             String id = baseDao.seletIdByIdCard(entity.getCustomerId(),entity.getIdCard());
             saveForm.setIcResiUserId(id);
-            guardarDatosFeignClient.saveCaResidentUser(saveForm);
         }
-
+        guardarDatosFeignClient.saveCaResidentUser(saveForm);
     }
 
     /**