From 849253173f9c3bf4bc94079d64b953e1467fa85a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 15 Apr 2020 18:47:53 +0800
Subject: [PATCH] =?UTF-8?q?8003=EF=BC=9A=E7=BB=84=E5=90=8D=E5=B7=B2?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=EF=BC=8C8201=EF=BC=9A=E8=AF=B7=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/commons/tools/exception/EpmetErrorCode.java    | 5 ++---
 .../member/service/impl/ResiGroupMemberServiceImpl.java      | 3 ++-
 .../main/java/com/epmet/modules/utils/ModuleConstant.java    | 5 +++++
 3 files changed, 9 insertions(+), 4 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 5439a91c14..f63f1274c4 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
@@ -9,8 +9,7 @@ public enum EpmetErrorCode {
 	SERVER_ERROR(8000, "服务器开小差了..."),
 	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
-	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
-	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
+	GROUP_ALREADY_EXISTED(8003,"组名已存在"),
 	LOSE_EFFICACY(8006,"此邀请链接已过期"),
 
 	MOBILE_HAS_BEEN_USED(8101, "该手机号已注册，请更换手机号或使用原绑定的微信账号登录"),
@@ -19,7 +18,7 @@ public enum EpmetErrorCode {
 	MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"),
 	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
 
-    CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。");
+    CANNOT_AUDIT_WARM(8201, "请完善居民信息");
 
 
 	private int code;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index dbd18ca126..e02a61318e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -206,7 +206,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getCode());
+			logger.error(ModuleConstant.ALREADY_APPLIED_GROUP);
+			throw new RenException(ModuleConstant.ALREADY_APPLIED_GROUP);
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
 			logger.error(ModuleConstant.ALREADY_IN_GROUP);
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
index 5e01d6b413..2b71fed3b0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
@@ -173,4 +173,9 @@ public interface ModuleConstant extends Constant {
 	 * 减号
 	 * */
 	String MINUS_OPERATION = "-";
+
+	/**
+	 * 避免重复加入群
+	 * */
+	String ALREADY_APPLIED_GROUP="该群已申请过，请耐心等待审核";
 }