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 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