From 3e6edb6b9663daf68e280d67b30f4b0c6b2862e8 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 17:45:19 +0800
Subject: [PATCH] act_read_record:read=>read_flag

---
 .../epmet/resi/group/dto/act/ActReadRecordDTO.java   |  2 +-
 .../modules/act/entity/ActReadRecordEntity.java      |  2 +-
 .../act/service/impl/GroupActInfoServiceImpl.java    | 12 +++++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
index b1040693b0..c9350d4716 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/act/ActReadRecordDTO.java
@@ -62,7 +62,7 @@ public class ActReadRecordDTO implements Serializable {
     /**
      * 已读:  read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录
      */
-	private String read;
+	private String readFlag;
 
     /**
      * 用户id
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java
index 561a3d760a..4ffe1d4c5f 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/entity/ActReadRecordEntity.java
@@ -58,7 +58,7 @@ public class ActReadRecordEntity extends BaseEpmetEntity {
     /**
      * 已读:  read未读：un_read；查看活动详情后修改此表，或者插入一条新的已读记录
      */
-	private String read;
+	private String readFlag;
 
     /**
      * 用户id
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 6276e1ab89..8fa5bfecd6 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
@@ -175,7 +175,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity();
             actReadRecordEntity.setCustomerId(customerId);
             actReadRecordEntity.setGroupActId(groupActId);
-            actReadRecordEntity.setRead(GroupActConstant.UN_READ);
+            actReadRecordEntity.setReadFlag(GroupActConstant.UN_READ);
             actReadRecordEntity.setUserId(memberDTO.getCustomerUserId());
             actReadRecordEntity.setShouldBeRead(Constant.YES);
             actReadRecordEntity.setGroupId(groupId);
@@ -370,6 +370,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
      * @param formDTO
      * @return com.epmet.resi.group.dto.act.result.ActDetailResultDTO
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public ActDetailResultDTO queryActDetail(ActDetailFormDTO formDTO) {
         GroupActInfoEntity groupActInfoEntity=baseDao.selectById(formDTO.getGroupActId());
@@ -393,16 +394,16 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
             ActReadRecordEntity insertEntity=new ActReadRecordEntity();
             insertEntity.setCustomerId(groupActInfoEntity.getCustomerId());
             insertEntity.setGroupActId(formDTO.getGroupActId());
-            insertEntity.setRead(GroupActConstant.READ);
+            insertEntity.setReadFlag(GroupActConstant.READ);
             insertEntity.setShouldBeRead(Constant.NO);
             insertEntity.setUserId(formDTO.getUserId());
             insertEntity.setGridId(groupActInfoEntity.getGridId());
             insertEntity.setGroupId(groupActInfoEntity.getGroupId());
             actReadRecordDao.insert(insertEntity);
         }else{
-            if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getRead())){
+            if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())){
                 //未读->已读
-                actReadRecordEntity.setRead(GroupActConstant.READ);
+                actReadRecordEntity.setReadFlag(GroupActConstant.READ);
                 actReadRecordEntity.setUpdatedTime(new Date());
                 actReadRecordDao.updateById(actReadRecordEntity);
             }
@@ -505,7 +506,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                         url.append(user.getHeadImgUrl());
                     }
                 });
-                if (GroupActConstant.READ.equals(l.getRead())) {
+                if (GroupActConstant.READ.equals(l.getReadFlag())) {
                     //已读
                     NoticeReadListResultDTO.NoticeReafdRecord read = new NoticeReadListResultDTO.NoticeReafdRecord();
                     read.setUserId(l.getUserId());
@@ -540,6 +541,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
      * @param formDTO
      * @return com.epmet.resi.group.dto.act.GroupActIdDTO
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public GroupActIdDTO cancelAct(CancelActFormDTO formDTO) {
         GroupActInfoEntity actInfoEntity=baseDao.selectById(formDTO.getGroupActId());