From 3ab4bca647c2296b9e5803f2eaed4cce4f5cb931 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 11:18:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=89=8D=EF=BC=8C=E5=8F=91=E5=B8=83=E6=97=B6=E5=90=8E=E5=85=A5?=
 =?UTF-8?q?=E7=BE=A4=E7=9A=84=E5=90=8C=E6=A0=B7=E6=8F=92=E5=85=A5=E5=B7=B2?=
 =?UTF-8?q?=E8=AF=BB=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/GroupActInfoServiceImpl.java | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index e828595573..c8d08a9348 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -514,14 +514,15 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         if(AppClientConstant.APP_RESI.equals(formDTO.getClient())){
             ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId());
             if (null != actReadRecordEntity) {
-                if(GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
-                    if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getViewDetail())){
+                //应读人员：发布活动时在群里的成员
+                if (GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) {
+                    if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getViewDetail())) {
                         //如果活动关闭，则不更新已读、未读。只记录是否查看过详情。
                         actReadRecordEntity.setUpdatedTime(new Date());
                         actReadRecordEntity.setViewDetail(GroupActConstant.READ);
                         actReadRecordDao.updateById(actReadRecordEntity);
                     }
-                }else{
+                } else {
                     //非关闭状态下，返回详情，并且已读状态
                     if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) {
                         actReadRecordEntity.setReadFlag(GroupActConstant.READ);
@@ -530,6 +531,20 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                         actReadRecordDao.updateById(actReadRecordEntity);
                     }
                 }
+            } else {
+                if (!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())) {
+                    //发布活动后，进入的成员
+                    ActReadRecordEntity insertEntity = new ActReadRecordEntity();
+                    insertEntity.setCustomerId(groupActInfoEntity.getCustomerId());
+                    insertEntity.setGroupActId(formDTO.getGroupActId());
+                    insertEntity.setReadFlag(GroupActConstant.READ);
+                    insertEntity.setViewDetail(GroupActConstant.READ);
+                    insertEntity.setShouldBeRead(Constant.NO);
+                    insertEntity.setUserId(formDTO.getUserId());
+                    insertEntity.setGridId(groupActInfoEntity.getGridId());
+                    insertEntity.setGroupId(groupActInfoEntity.getGroupId());
+                    actReadRecordDao.insert(insertEntity);
+                }
             }
         }
         return resultDTO;

From b938632df6517ffa9f62ac139d5bb471332e089c Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 11:20:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=EF=BC=8C=E6=9F=A5=E7=9C=8B=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/act/service/impl/GroupActInfoServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
index c8d08a9348..da18613611 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java
@@ -803,6 +803,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         ActDetailFormDTO actDetailFormDTO = new ActDetailFormDTO();
         actDetailFormDTO.setUserId(formDTO.getUserId());
         actDetailFormDTO.setGroupActId(invitationRecordDTO.getSourceId());
+        actDetailFormDTO.setClient(AppClientConstant.APP_RESI);
+
         //调用查看活动详情接口
         ActDetailResultDTO actDetailResultDTO = queryActDetail(actDetailFormDTO);