elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_group_code' into dev_temp

dev_shibei_match
yinzuomei 5 years ago
parent
a94a05265a ee58f84e7b
commit
c747b5df8e
1 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

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

@ -221,11 +221,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));
logger.warn(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),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));
logger.warn(String.format("居民端用户【%s】申请加入小组【%s】失败,错误提示:%s",applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId(),ModuleConstant.ALREADY_IN_GROUP));
return;
}
//插入一条待审核的记录
@ -249,7 +249,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
try {
ResiGroupMemberDTO groupLeader = resiGroupDao.selectGroupLeader(resiGroupDTO.getId());
if (null == groupLeader) {
logger.error(String.format("居民申请入群，给组长发送消息通知异常，查询组长信息为空groupId%s", resiGroupDTO.getId()));
logger.warn(String.format("居民申请入群，给组长发送消息通知异常，查询组长信息为空groupId%s", resiGroupDTO.getId()));
return;
}
UserMessageFormDTO userMessage = new UserMessageFormDTO();
@ -263,7 +263,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
userResiInfoFormDTO.setUserId(currentUserId);
Result<UserResiInfoResultDTO> resultUserInfo = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
if (!resultUserInfo.success() || null == resultUserInfo.getData()) {
logger.error(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO)));
logger.warn(String.format("居民申请入群，给组长发送消息通知错误，调用%s服务查询申请用户名称失败,入参%s", ServiceConstant.EPMET_USER_SERVER, JSON.toJSONString(userResiInfoFormDTO)));
} else {
currentUserName = resultUserInfo.getData().getShowName();
}
@ -288,7 +288,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
msgList.add(subscribeDTO);
epmetMessageOpenFeignClient.sendWxSubscribeMessage(msgList);
} catch (Exception e) {
logger.error("居民申请入群，给组长发送消息通知异常");
logger.warn("居民申请入群，给组长发送消息通知异常");
e.printStackTrace();
}
}
@ -305,7 +305,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
groupMemberListFormDTO.setPageNo(pageIndex);
List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
if (null == list || list.size() == 0) {
logger.error(String.format("群成员列表查询列表为空,selectListGroupMember入参%s",JSON.toJSONString(groupMemberListFormDTO)));
logger.warn(String.format("群成员列表查询列表为空,selectListGroupMember入参%s",JSON.toJSONString(groupMemberListFormDTO)));
return new ArrayList<>();
}
List<String> userIdList=new ArrayList<>();
@ -424,13 +424,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
//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));
logger.warn(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),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));
logger.warn(String.format("居民端组长【%s】同意用户入群申请applyId【%s】失败,错误提示:%s",agreeApplyFormDTO.getUserId(),agreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
return;
}
//3、修改操作状态
@ -533,13 +533,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
//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));
logger.warn(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),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));
logger.warn(String.format("居民端组长【%s】拒绝用户入群申请applyId【%s】失败,错误提示:%s",disagreeApplyFormDTO.getUserId(),disagreeApplyFormDTO.getApplyId(),ModuleConstant.CANNOT_AUDIT_APPLY));
return;
}
//3、修改操作状态

Write Preview
Loading…
Cancel
Save