入组方式添加支部小组校验

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -32,6 +32,7 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.feign.ResiGuideFeignClient;
@@ -46,6 +47,7 @@ import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.member.service.GroupMemeberOperationService;
 import com.epmet.modules.member.service.ResiGroupMemberService;
 import com.epmet.modules.member.service.impl.ResiGroupMemberServiceImpl;
+import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.resi.group.constant.EnterGroupTypeConstant;
 import com.epmet.resi.group.constant.GroupStateConstant;
 import com.epmet.resi.group.constant.LeaderFlagConstant;
@@ -106,6 +108,8 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	private ResiGroupRedis resiGroupRedis;
 	@Autowired
 	private ResiGroupMemberServiceImpl resiGroupMemberServiceImpl;
+	@Autowired
+	private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 	@Override
 	public PageData<GroupInvitationDTO> page(Map<String, Object> params) {
@@ -455,6 +459,19 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 			logger.info("已经在群内,直接返回成功");
 			return resultDTO;
 		}
+		// 查询小组类型，楼院小组：支部小组
+		ResiGroupDTO resiGroupInfo = resiGroupService.get(groupInvitationDTO.getResiGroupId());
+		if (resiGroupInfo.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
+			Result<Boolean> booleanResult = epmetUserOpenFeignClient.selectIsPartyMemberByUserId(formDTO.getUserId());
+			if (!booleanResult.success()){
+				throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
+			}
+			// 不是党员直接抛出
+			if (!booleanResult.getData()){
+				throw new RenException(EpmetErrorCode.PARTY_MEMBER_JOIN_BRANCH_GROUP.getCode());
+			}
+		}
+
 		//2020.11.26 sun start
 		//先判断用户是否有在审核的入组申请，有的话直接给提示
 		GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java

@@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -247,6 +248,18 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             result.setStatus("entered");
             return result;
         }
+        // 查询小组类型
+        ResiGroupDTO resiGroupInfo = groupService.get(groupId);
+        if (resiGroupInfo.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
+            Result<Boolean> booleanResult = userClient.selectIsPartyMemberByUserId(param.getUserId());
+            if (!booleanResult.success()){
+                throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
+            }
+            // 不是党员直接抛出
+            if (!booleanResult.getData()){
+                throw new RenException(EpmetErrorCode.PARTY_MEMBER_JOIN_BRANCH_GROUP.getCode());
+            }
+        }
 
         //先判断用户是否有在审核的入组申请，有的话直接给提示
         GroupMemeberOperationDTO groupMemeberOperationDTO = operationDao.selectLatestRecord(groupId, param.getUserId());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -218,6 +218,18 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 		//校验是否已经注册居民
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(applyJoinGroupFormDTO.getGroupId());
 		if (null != resiGroupDTO) {
+			// 校验小组类型，并做出相应操作
+			if (resiGroupDTO.getGroupType().equals(ModuleConstant.GROUP_TYPE_BRANCH)){
+				Result<Boolean> booleanResult = userOpenFeignClient.selectIsPartyMemberByUserId(applyJoinGroupFormDTO.getUserId());
+				if (!booleanResult.success()){
+					throw new RenException(ModuleConstant.IS_PARTY_MEMBER_ERR);
+				}
+				// 不是党员直接抛出
+				if (!booleanResult.getData()){
+					throw new RenException(EpmetErrorCode.PARTY_MEMBER_JOIN_BRANCH_GROUP.getCode());
+				}
+			}
+
 			UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
 					applyJoinGroupFormDTO.getUserId(),
 					resiGroupDTO.getCustomerId(),