Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -193,8 +193,6 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
     }
 
     private void saveActReadRecord(GroupActInfoEntity groupActInfoEntity,List<ResiGroupMemberDTO> memberDTOList) {
-        /*String actReadKey= RedisKeys.getGroupMsgReadKey(GroupActConstant.ACT_STR,groupActInfoEntity.getGroupId(),groupActInfoEntity.getId());
-        String actShoudReadUserKey=RedisKeys.getGroupMsgShouldReadUser(GroupActConstant.ACT_STR,groupActInfoEntity.getGroupId(),groupActInfoEntity.getId());*/
         List<ActReadRecordEntity> readRecordEntityList=new ArrayList<>();
         memberDTOList.forEach(memberDTO->{
             ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity();
@@ -206,11 +204,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             actReadRecordEntity.setGroupId(groupActInfoEntity.getGroupId());
             actReadRecordEntity.setGridId(groupActInfoEntity.getGridId());
             if(!groupActInfoEntity.getPublishUserId().equals(memberDTO.getCustomerUserId())){
+                //组长不记录 已读记录
                 readRecordEntityList.add(actReadRecordEntity);
-               /* //默认是未读
-                redisUtils.setBit(actReadKey,memberDTO.getTempNum(),false);
-                //当前所有成员默认应读
-                redisUtils.setBit(actShoudReadUserKey,memberDTO.getTempNum(),true);*/
             }
         });
         readRecordEntityList.forEach(readRecordEntity->{
@@ -505,12 +500,14 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         resultDTO.setUserRole(resiGroupMemberDTO.getGroupLeaderFlag());
         // 有签到后不可以修改活动时间：true可以修改，false不可以，
         resultDTO.setStartTimeEditFlag(groupActInfoEntity.getSignedInNum() > NumConstant.ZERO ? false : true);
-        //返回详情，并且已读状态
+        if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) {
-        ActReadRecordEntity actReadRecordEntity=actReadRecordDao.selectUserRec(formDTO.getGroupActId(),formDTO.getUserId());
+            //如果活动关闭，则不更新已读记录
-        if(null== actReadRecordEntity){
+            //非关闭状态下，返回详情，并且已读状态
-            if(!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
+            ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId());
+            if (null == actReadRecordEntity) {
+                if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) {
                     //插入已读记录，默认不属于应读人。
-                ActReadRecordEntity insertEntity=new ActReadRecordEntity();
+                    ActReadRecordEntity insertEntity = new ActReadRecordEntity();
                     insertEntity.setCustomerId(groupActInfoEntity.getCustomerId());
                     insertEntity.setGroupActId(formDTO.getGroupActId());
                     insertEntity.setReadFlag(GroupActConstant.READ);
@@ -520,14 +517,15 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                     insertEntity.setGroupId(groupActInfoEntity.getGroupId());
                     actReadRecordDao.insert(insertEntity);
                 }
-        }else{
+            } else {
-            if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())){
+                if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) {
                     //未读->已读
                     actReadRecordEntity.setReadFlag(GroupActConstant.READ);
                     actReadRecordEntity.setUpdatedTime(new Date());
                     actReadRecordDao.updateById(actReadRecordEntity);
                 }
             }
+        }
         return resultDTO;
     }