From 7c79b96478f23d948824d689594bafba9aa0b38b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 13 Jan 2023 17:54:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B/epmetuser/myHome/ho?=
 =?UTF-8?q?meInfo=E8=BF=99=E4=B8=AA=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/MyHomeServiceImpl.java | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
index 9f5df02195..0e209992c1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/MyHomeServiceImpl.java
@@ -196,20 +196,25 @@ public class MyHomeServiceImpl implements MyHomeService {
      */
     @Override
     public HomeInfoResultDTO getHomeInfo(TokenDto tokenDto) {
-        HomeInfoResultDTO resultDto = new HomeInfoResultDTO();
         //通过用户ID获取居民端用户信息
         ResiUserBaseInfoResultDTO baseInfo = userBaseInfoDao.selecUserBaseInfoByUserId(tokenDto.getUserId());
-        if (null == baseInfo) {
-            return resultDto;
+        if (null == baseInfo||StringUtils.isBlank(baseInfo.getIdNum())) {
+            log.warn(String.format("user_base_info.id_num is null userId:%s",tokenDto.getUserId()));
+            return null;
         }
         //通过居民身份证号获取居民信息
         LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IcResiUserEntity::getCustomerId, tokenDto.getCustomerId());
         wrapper.eq(IcResiUserEntity::getIdCard, baseInfo.getIdNum());
+        wrapper.select(IcResiUserEntity::getId)
+                .select(IcResiUserEntity::getHomeId)
+                .select(IcResiUserEntity::getIdCard);
         IcResiUserEntity icUser = icResiUserDao.selectOne(wrapper);
         if (null == icUser) {
-            return resultDto;
+            log.warn(String.format("ic_resi_user is null id_card:%s",baseInfo.getIdNum()));
+            return null;
         }
+        HomeInfoResultDTO resultDto = new HomeInfoResultDTO();
         resultDto.setIcResiUserId(icUser.getId());
         //通过房屋ID获取房屋信息
         HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(tokenDto.getCustomerId(), icUser.getHomeId());
@@ -221,6 +226,7 @@ public class MyHomeServiceImpl implements MyHomeService {
         resultDto.setHouseCode(houseInfo.getHouseCode());
         resultDto.setQrCodeUrl(houseInfo.getHouseQrcodeUrl());
         resultDto.setCoding(houseInfo.getCoding());
+        /*没必要再调用feign了，上面缓存houseInfo已经有值了
         //获取房屋房主信息，判断是否是房主
         Result<IcHouseDTO> icHouseResult = govOrgOpenFeignClient.get(icUser.getHomeId());
         if (!icHouseResult.success() || null == icHouseResult.getData()) {
@@ -230,8 +236,13 @@ public class MyHomeServiceImpl implements MyHomeService {
             resultDto.setIsOwner(NumConstant.ONE_STR);
         } else {
             resultDto.setIsOwner(NumConstant.ZERO_STR);
+        }*/
+        if (icUser.getIdCard().equals(houseInfo.getOwnerIdCard())) {
+            resultDto.setIsOwner(NumConstant.ONE_STR);
+        } else {
+            resultDto.setIsOwner(NumConstant.ZERO_STR);
         }
-        resultDto.setOwnerIdCard(icHouseResult.getData().getOwnerIdCard());
+        resultDto.setOwnerIdCard(houseInfo.getOwnerIdCard());
         return resultDto;
     }