From e2c0ae6071ca624453e21e26f583cee71712ea06 Mon Sep 17 00:00:00 2001
From: yinzuomei <57602893@qq.com>
Date: Tue, 31 Mar 2020 16:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E9=95=BF=E5=90=8C=E6=84=8F=E5=85=A5?=
 =?UTF-8?q?=E7=BE=A4=E3=80=81=E6=8B=92=E7=BB=9D=E5=85=A5=E7=BE=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/dao/ResiGroupMemberDao.java        | 10 ++++++++
 .../impl/ResiGroupMemberServiceImpl.java      | 24 ++++++++++++++++++-
 .../epmet/modules/utils/ModuleConstant.java   | 10 ++++++++
 .../mapper/member/ResiGroupMemberDao.xml      | 12 ++++++++++
 4 files changed, 55 insertions(+), 1 deletion(-)

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 308999e187..6c7d8bf7b5 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
@@ -86,4 +86,14 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
 	 * @Date 2020/3/31 14:52
 	 **/
 	GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
+
+	/**
+	 * @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
+	 * @param groupId
+	 * @param userId
+	 * @Author yinzuomei
+	 * @Description 根据组id+用户id查询成员信息
+	 * @Date 2020/3/31 16:06
+	 **/
+	ResiGroupMemberDTO selectGroupMemberInfo(@Param("groupId") String groupId, @Param("userId")String userId);
 }
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 b217cc764f..2d274d18f4 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
@@ -36,6 +36,7 @@ import com.epmet.modules.member.entity.ResiGroupMemberEntity;
 import com.epmet.modules.member.redis.ResiGroupMemberRedis;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
+import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
 import com.epmet.resi.group.constant.MemberStateConstant;
@@ -236,10 +237,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	 **/
 	@Override
 	public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
-		//修改操作状态
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
+		//当前申请单是否是待审核
+		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
+		}
+		//只有群主才可以审批入群申请
+		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
+		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
+			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
+		}
+		//修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
 		groupMemeberOperationDTO.setUpdatedBy(agreeApplyFormDTO.getUserId());
+		groupMemeberOperationDTO.setOperateUserId(agreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		//加入群成员关系表
 		ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
@@ -268,9 +279,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	@Override
 	public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
+		//当前申请单是否是待审核
+		if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
+			return new Result().error(ModuleConstant.APPLY_NOEXISTS);
+		}
+		//只有群主才可以审批入群申请
+		ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
+		if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
+			return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
+		}
+		//修改操作状态
 		groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
 		groupMemeberOperationDTO.setOperateDes(disagreeApplyFormDTO.getOperateDesc());
 		groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
+		groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
 		groupMemeberOperationService.update(groupMemeberOperationDTO);
 		return new Result();
 	}
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 805b1496d7..e1678d364a 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
@@ -67,4 +67,14 @@ public interface ModuleConstant extends Constant {
 	 * customerId不能为空
 	 */
 	String CUSTOMERID_NOT_NULL="客户id不能为空";
+
+	/**
+	 * 组长审批时校验申请单是否存在
+	 */
+	String APPLY_NOEXISTS="申请单被删除";
+
+	/**
+	 * 组长审批时校验当前用户身份
+	 */
+	String CANNOT_AUDIT_APPLY="只有群主才可以审批入群申请";
 }
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 4a47034b33..11c6f10481 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
@@ -81,4 +81,16 @@
         and gmo.CUSTOMER_USER_ID=#{userId}
         and gmo.GROUP_ID=#{groupId}
     </select>
+
+    <!-- 根据组id+用户id查询成员信息   -->
+    <select id="selectGroupMemberInfo"parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
+         SELECT
+            rgm.*
+        FROM
+            resi_group_member rgm
+        WHERE
+            rgm.DEL_FLAG = '0'
+            AND rgm.RESI_GROUP_ID = #{groupId}
+            AND rgm.CUSTOMER_USER_ID=#{userId}
+    </select>
 </mapper>