From dd72b2a4966de743ca28c84d8e0420ab5526633b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 20 Apr 2021 23:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B98909=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java     | 2 +-
 .../modules/act/service/impl/ActSignInRecordServiceImpl.java  | 4 ++--
 .../modules/act/service/impl/GroupActInfoServiceImpl.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
index 90ed153985..58b2520023 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
@@ -169,7 +169,7 @@ public enum EpmetErrorCode {
 	PARTY_MEMBER_CREATE_BRANCH_GROUP(8906,"您不是党员，不能创建支部小组"),
 	NOT_IN_GROUP_CAN_NOT_VIEW(8907,"当前内容仅允许组内成员查看"),
 	PARTY_MEMBER_JOIN_BRANCH_GROUP(8908,"您不是党员，不能加入支部小组"),
-	GROUP_ACT_CAN_NOT_CANCEL(8909,"活动%s,不能取消"),
+	GROUP_ACT_CAN_NOT_CANCEL(8909,"当前活动已关闭或已取消"),
 	//8910的msg动态赋值
 	GROUP_ACT_CAN_NOT_COMMENT(8910,"当前活动,不能评论"),
 	SIGN_IN_TIME_NOT_START(8911,"未到签到时间,不允许签到"),
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
index 956fbe0162..e1576ce255 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/ActSignInRecordServiceImpl.java
@@ -162,9 +162,9 @@ public class ActSignInRecordServiceImpl extends BaseServiceImpl<ActSignInRecordD
         }
         //关闭、已取消不能签到
         if (GroupActConstant.CLOSED.equals(originalActInfo.getStatus())) {
-            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), "活动已关闭,不能签到");
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
         } else if (GroupActConstant.CANCELED.equals(originalActInfo.getStatus())) {
-            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), "活动已取消,不能签到");
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
         }
 
         if (null == originalActInfo.getSignInStartTime() || null == originalActInfo.getSignInEndTime()) {
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 af698fe6ec..1faac0e6ba 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
@@ -554,9 +554,9 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         }
         //2、活动已关闭，不能取消
         if (GroupActConstant.CLOSED.equals(actInfoEntity.getStatus())) {
-            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), String.format(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg(), "已关闭"));
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
         } else if (GroupActConstant.CANCELED.equals(actInfoEntity.getStatus())) {
-            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), "活动已取消");
+            throw new RenException(EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getCode(), EpmetErrorCode.GROUP_ACT_CAN_NOT_CANCEL.getMsg());
         }
         //3、取消原因审核
         TextScanParamDTO textScanParamDTO = new TextScanParamDTO();