Merge remote-tracking branch 'origin/dev_group0329' into dev_temp

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

@@ -21,7 +21,6 @@ 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;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -204,4 +203,16 @@ public class ResiGroupMemberRedis {
         return null;
     }
 
+    /**
+     * @return void
+     * @param groupId
+     * @param userId
+     * @author yinzuomei
+     * @description 删除某个小组成员的缓存信息
+     * @Date 2021/3/31 10:08
+     **/
+    public void deleteMemberCatche(String groupId, String userId) {
+        String key=ResiGroupRedisKeys.getResiGroupMemberInfoKey(groupId,userId);
+        redisUtils.delete(key);
+    }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupLeaderTransferRecordServiceImpl.java

@@ -31,6 +31,7 @@ import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.group.service.ResiGroupService;
 import com.epmet.modules.member.dao.GroupLeaderTransferRecordDao;
 import com.epmet.modules.member.entity.GroupLeaderTransferRecordEntity;
+import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupLeaderTransferRecordService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -65,6 +66,8 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private ResiGroupService resiGroupService;
+    @Autowired
+    private ResiGroupMemberRedis resiGroupMemberRedis;
 
     @Override
     public PageData<GroupLeaderTransferRecordDTO> page(Map<String, Object> params) {
@@ -161,6 +164,24 @@ public class GroupLeaderTransferRecordServiceImpl extends BaseServiceImpl<GroupL
         insert(entity);
         //发送站内信
         saveUserMessage(formDTO,originalLeader.getCustomerUserId());
+        //新组长、原组长成员缓存更新
+        this.updateGroupMemberInfo(originalLeader.getCustomerUserId(),formDTO.getNewLeaderUserId(),formDTO.getGroupId());
+    }
+
+    /**
+     * @return void
+     * @param originalLeaderUserId
+     * @param newLeaderUserId
+     * @param groupId
+     * @author yinzuomei
+     * @description 先删缓存，后查（没有会查数据库同时放进缓存）
+     * @Date 2021/3/31 10:09
+     **/
+    private void updateGroupMemberInfo(String originalLeaderUserId, String newLeaderUserId, String groupId) {
+        resiGroupMemberRedis.deleteMemberCatche(groupId,originalLeaderUserId);
+        resiGroupMemberRedis.deleteMemberCatche(groupId,newLeaderUserId);
+        resiGroupMemberRedis.get(groupId,originalLeaderUserId);
+        resiGroupMemberRedis.get(groupId,newLeaderUserId);
     }
 
     private void saveUserMessage(ConfirmTransferFormDTO formDTO,String originalLeaderUserId) {