|
|
|
@ -218,11 +218,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD |
|
|
|
GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId()); |
|
|
|
if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){ |
|
|
|
logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_APPLIED_GROUP)); |
|
|
|
throw new RenException(ModuleConstant.ALREADY_APPLIED_GROUP); |
|
|
|
return; |
|
|
|
} |
|
|
|
if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){ |
|
|
|
logger.error(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_IN_GROUP)); |
|
|
|
throw new RenException(ModuleConstant.ALREADY_IN_GROUP); |
|
|
|
return; |
|
|
|
} |
|
|
|
//插入一条待审核的记录
|
|
|
|
GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO(); |
|
|
|
@ -287,27 +287,33 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD |
|
|
|
int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize(); |
|
|
|
groupMemberListFormDTO.setPageNo(pageIndex); |
|
|
|
List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO); |
|
|
|
if (null != list && list.size() > 0) { |
|
|
|
List<String> userIdList=new ArrayList<>(); |
|
|
|
for (GroupMemberListResultDTO groupMemberListResultDTO : list) { |
|
|
|
userIdList.add(groupMemberListResultDTO.getUserId()); |
|
|
|
} |
|
|
|
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); |
|
|
|
formDTO.setUserIdList(userIdList); |
|
|
|
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); |
|
|
|
if(userResiInfoDTOListResult.success()){ |
|
|
|
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ |
|
|
|
for (GroupMemberListResultDTO groupMember : list) { |
|
|
|
if(groupMember.getUserId().equals(userResiInfo.getUserId())){ |
|
|
|
groupMember.setUserShowName(userResiInfo.getShowName()); |
|
|
|
groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (null == list || list.size() == 0) { |
|
|
|
logger.error(String.format("群成员列表查询列表为空,selectListGroupMember入参%s",JSON.toJSONString(groupMemberListFormDTO))); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<String> userIdList=new ArrayList<>(); |
|
|
|
for (GroupMemberListResultDTO groupMemberListResultDTO : list) { |
|
|
|
userIdList.add(groupMemberListResultDTO.getUserId()); |
|
|
|
} |
|
|
|
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); |
|
|
|
formDTO.setUserIdList(userIdList); |
|
|
|
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); |
|
|
|
if(userResiInfoDTOListResult.success()){ |
|
|
|
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ |
|
|
|
for (GroupMemberListResultDTO groupMember : list) { |
|
|
|
if(groupMember.getUserId().equals(userResiInfo.getUserId())){ |
|
|
|
groupMember.setUserShowName(userResiInfo.getShowName()); |
|
|
|
groupMember.setHeadPhoto(userResiInfo.getHeadPhoto()); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
logger.error(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", groupMemberListFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
logger.warn(String.format("居民端用户【%s】查看群成员列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s", |
|
|
|
groupMemberListFormDTO.getUserId(), |
|
|
|
ServiceConstant.EPMET_USER_SERVER, |
|
|
|
userResiInfoDTOListResult.getCode(), |
|
|
|
userResiInfoDTOListResult.getMsg())); |
|
|
|
} |
|
|
|
return list; |
|
|
|
} |
|
|
|
@ -324,28 +330,29 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD |
|
|
|
int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize(); |
|
|
|
applyingMemberFormDTO.setPageNo(pageIndex); |
|
|
|
List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO); |
|
|
|
if (null != list && list.size() > 0) { |
|
|
|
List<String> userIdList=new ArrayList<>(); |
|
|
|
for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { |
|
|
|
userIdList.add(applyingMemberResultDTO.getApplyUserId()); |
|
|
|
} |
|
|
|
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); |
|
|
|
formDTO.setUserIdList(userIdList); |
|
|
|
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); |
|
|
|
if(userResiInfoDTOListResult.success()){ |
|
|
|
for (ApplyingMemberResultDTO memberInfo : list) { |
|
|
|
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ |
|
|
|
if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ |
|
|
|
memberInfo.setApplyUserName(userResiInfo.getShowName()); |
|
|
|
memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); |
|
|
|
break; |
|
|
|
} |
|
|
|
if (null == list || list.size() == 0) { |
|
|
|
logger.info(String.format("查看入群待审核列表返回为空,selectListApplyingMember入参%s",JSON.toJSONString(applyingMemberFormDTO))); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
List<String> userIdList=new ArrayList<>(); |
|
|
|
for (ApplyingMemberResultDTO applyingMemberResultDTO : list) { |
|
|
|
userIdList.add(applyingMemberResultDTO.getApplyUserId()); |
|
|
|
} |
|
|
|
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO(); |
|
|
|
formDTO.setUserIdList(userIdList); |
|
|
|
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO); |
|
|
|
if(userResiInfoDTOListResult.success()){ |
|
|
|
for (ApplyingMemberResultDTO memberInfo : list) { |
|
|
|
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){ |
|
|
|
if(memberInfo.getApplyUserId().equals(userResiInfo.getUserId())){ |
|
|
|
memberInfo.setApplyUserName(userResiInfo.getShowName()); |
|
|
|
memberInfo.setApplyUserHeadPhoto(userResiInfo.getHeadPhoto()); |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
logger.error(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); |
|
|
|
} |
|
|
|
|
|
|
|
}else{ |
|
|
|
logger.warn(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg())); |
|
|
|
} |
|
|
|
return list; |
|
|
|
} |
|
|
|
@ -363,13 +370,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD |
|
|
|
//1、当前申请单是否是待审核
|
|
|
|
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) { |
|
|
|
logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS)); |
|
|
|
throw new RenException(ModuleConstant.APPLY_NOEXISTS); |
|
|
|
return; |
|
|
|
} |
|
|
|
//2、只有群主才可以审批入群申请
|
|
|
|
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId()); |
|
|
|
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) { |
|
|
|
logger.error(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY)); |
|
|
|
throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY); |
|
|
|
return; |
|
|
|
} |
|
|
|
//3、修改操作状态
|
|
|
|
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED); |
|
|
|
@ -460,13 +467,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD |
|
|
|
//1、当前申请单是否是待审核
|
|
|
|
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) { |
|
|
|
logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.APPLY_NOEXISTS)); |
|
|
|
throw new RenException(ModuleConstant.APPLY_NOEXISTS); |
|
|
|
return; |
|
|
|
} |
|
|
|
//2、只有群主才可以审批入群申请
|
|
|
|
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId()); |
|
|
|
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) { |
|
|
|
logger.error(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY)); |
|
|
|
throw new RenException(ModuleConstant.CANNOT_AUDIT_APPLY); |
|
|
|
return; |
|
|
|
} |
|
|
|
//3、修改操作状态
|
|
|
|
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED); |
|
|
|
|
wxz
5 years ago