From c4fa93583613d085db0b18a85769e9a576344401 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 14:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E7=BE=A4=E7=94=B3=E8=AF=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=E9=87=8D=E5=A4=8D=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/exception/EpmetErrorCode.java |  3 ++-
 .../epmet/modules/member/dao/ResiGroupMemberDao.java  | 11 +++++++++++
 .../service/impl/ResiGroupMemberServiceImpl.java      |  9 +++++++++
 .../resources/mapper/member/ResiGroupMemberDao.xml    |  9 +++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

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 e8d27581d9..b9b252dcad 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
@@ -8,7 +8,8 @@ package com.epmet.commons.tools.exception;
 public enum EpmetErrorCode {
 	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
-	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改");
+	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
+	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核");
 
 	private int value;
 	private String name;
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
index e123723ed6..308999e187 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
@@ -20,6 +20,7 @@ package com.epmet.modules.member.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.resi.group.dto.UserRoleDTO;
+import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.form.ApplyingMemberFormDTO;
 import com.epmet.resi.group.dto.member.form.GroupMemberListFormDTO;
@@ -75,4 +76,14 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2020/3/31 13:04
 	 **/
 	ResiGroupMemberDTO selectLeaderMember(String groupId);
+
+	/**
+	 * @return com.epmet.resi.group.dto.member.GroupMemeberOperationDTO
+	 * @param userId
+	 * @param groupId
+	 * @Author yinzuomei
+	 * @Description 查看用户是否存在有效的入群申请
+	 * @Date 2020/3/31 14:52
+	 **/
+	GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
 }
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 4e1f7aa2ff..b217cc764f 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
@@ -175,6 +175,14 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 				return errorResult;
 			}
 		}
+		//校验是否存在待审核的入群记录
+		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationUnderAudit(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
+		if(null!=groupMember){
+			Result errorResult = new Result();
+			errorResult.setCode(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue());
+			errorResult.setMsg(EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
+			return errorResult;
+		}
 		//插入一条待审核的记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
 		groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
@@ -184,6 +192,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		groupMemeberOperation.setOperateStatus(MemberStateConstant.UNDER_AUDITTING);
 		groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.JOIN);
 		groupMemeberOperation.setCreatedBy(applyJoinGroupFormDTO.getUserId());
+		groupMemeberOperation.setOperateUserId(applyJoinGroupFormDTO.getUserId());
 		groupMemeberOperationService.save(groupMemeberOperation);
 		return new Result();
 	}
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
index b2e83538c5..b618ff112d 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
@@ -70,4 +70,13 @@
             AND rgm.GROUP_LEADER_FLAG = 'leader'
             AND rgm.RESI_GROUP_ID = #{groupId}
     </select>
+
+    <!--  查看用户是否存在有效的入群申请  -->
+    <select id="selectGroupMemberOperationUnderAudit" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
+        select gmo.* from group_memeber_operation gmo
+        where gmo.DEL_FLAG='0'
+        and gmo.OPERATE_STATUS='under_auditting'
+        and gmo.CUSTOMER_USER_ID=#{userId}
+        and gmo.GROUP_ID=#{groupId}
+    </select>
 </mapper>