get组员缓存修改

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java

@@ -18,6 +18,7 @@
 package com.epmet.modules.member.redis;
 
 
+import cn.hutool.core.bean.BeanUtil;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.redis.RedisKeys;
@@ -25,6 +26,7 @@ import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.modules.constant.ResiGroupRedisKeys;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -115,21 +117,34 @@ public class ResiGroupMemberRedis {
                 memberRedis.setMemberStatus(memberMySql.getStatus());
 
 
-                UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
-                userParam.setUserId(memberMySql.getCustomerUserId());
-                userParam.setCustomerId(groupService.get(groupId).getCustomerId());
-                Result<UserResiInfoResultDTO> userInfo =  epmetUserFeignClient.getUserResiInfoDTO(userParam);
-                if(userInfo.success()){
-                    if(null != userInfo.getData()){
-                        memberRedis.setUserShowName(userInfo.getData().getShowName());
-                        memberRedis.setUserHeadPhoto(userInfo.getData().getHeadPhoto());
-                        memberRedis.setMemberMobile(userInfo.getData().getRegMobile());
+
+                Map<String,Object> map = redisUtils.hGetAll(String.format("epmet:resi:user:%s",userId));
+                if(null != map && !map.isEmpty()) {
+                    //缓存中有数据，直接返回
+                    UserBaseInfoResultDTO userInfo =
+                        BeanUtil.mapToBean(map, UserBaseInfoResultDTO.class, true);
+                    if(null != userInfo){
+                        memberRedis.setUserShowName(userInfo.getShowName());
+                        memberRedis.setUserHeadPhoto(userInfo.getHeadImgUrl());
+                        memberRedis.setMemberMobile(userInfo.getMobile());
+                        set(memberRedis);
+                    }
+                }else {
+                    UserResiInfoFormDTO userParam = new UserResiInfoFormDTO();
+                    userParam.setUserId(memberMySql.getCustomerUserId());
+                    userParam.setCustomerId(groupService.get(groupId).getCustomerId());
+                    Result<UserResiInfoResultDTO> userInfo = epmetUserFeignClient.getUserResiInfoDTO(userParam);
+                    if (userInfo.success()) {
+                        if (null != userInfo.getData()) {
+                            memberRedis.setUserShowName(userInfo.getData().getShowName());
+                            memberRedis.setUserHeadPhoto(userInfo.getData().getHeadPhoto());
+                            memberRedis.setMemberMobile(userInfo.getData().getRegMobile());
+                            set(memberRedis);
+                        }
+                    } else {
+                        logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);
                     }
-                }else{
-                    logger.warn(ModuleConstant.USER_INFO_LIST_NOT_FOUND);
                 }
-
-                set(memberRedis);
                 return memberRedis;
             }else{
                 //日志打印效果:找不到组员信息，组Id: ********，用户Id:********