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

---
 .../epmet/modules/member/dao/ResiGroupMemberDao.java   |  2 +-
 .../service/impl/ResiGroupMemberServiceImpl.java       | 10 +++++++---
 .../java/com/epmet/modules/utils/ModuleConstant.java   |  5 +++++
 .../resources/mapper/member/ResiGroupMemberDao.xml     |  5 +++--
 4 files changed, 16 insertions(+), 6 deletions(-)

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 6c7d8bf7b5..737474d53d 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
@@ -85,7 +85,7 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Description 查看用户是否存在有效的入群申请
 	 * @Date 2020/3/31 14:52
 	 **/
-	GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
+	GroupMemeberOperationDTO selectGroupMemberOperationLatest(@Param("userId") String userId, @Param("groupId") String groupId);
 
 	/**
 	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
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 f3d6f585a5..25d308c595 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
@@ -48,6 +48,7 @@ import com.epmet.resi.group.dto.member.form.*;
 import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.math.raw.Mod;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -176,14 +177,17 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 				return errorResult;
 			}
 		}
-		//校验是否存在待审核的入群记录
-		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationUnderAudit(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
-		if(null!=groupMember){
+		//查看用户最新一条成员处理记录，避免重复申请
+		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
+		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
 			Result errorResult = new Result();
 			errorResult.setCode(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue());
 			errorResult.setMsg(EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
 			return errorResult;
 		}
+		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
+			return new Result().error(ModuleConstant.ALREADY_IN_GROUP);
+		}
 		//插入一条待审核的记录
 		GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
 		groupMemeberOperation.setGroupId(applyJoinGroupFormDTO.getGroupId());
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 e1678d364a..646ec81fa3 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
@@ -77,4 +77,9 @@ public interface ModuleConstant extends Constant {
 	 * 组长审批时校验当前用户身份
 	 */
 	String CANNOT_AUDIT_APPLY="只有群主才可以审批入群申请";
+
+	/**
+	 * 申请入群是校验是否已经在群内
+	 */
+	String ALREADY_IN_GROUP="已经在群内，无需申请";
 }
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 b175972d81..2ae5acd289 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
@@ -74,12 +74,13 @@
     </select>
 
     <!--  查看用户是否存在有效的入群申请  -->
-    <select id="selectGroupMemberOperationUnderAudit" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
+    <select id="selectGroupMemberOperationLatest" 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}
+        order by gmo.CREATED_TIME desc
+        limit 1
     </select>
 
     <!-- 根据组id+用户id查询成员信息   -->