luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

master
sunyuchao 4 years ago
parent
eb01bb1947 ee4a8d7570
commit
ccee1a6ac9
1 changed files with 38 additions and 4 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. 42
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

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

@ -35,6 +35,7 @@ import com.epmet.constant.ReadFlagConstant;
import com.epmet.dto.IssueShareLinkVisitRecordDTO;
import com.epmet.dto.form.*;
import com.epmet.dto.result.UserBaseInfoResultDTO;
import com.epmet.dto.result.UserInfoResultDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.EpmetMessageOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient;
@ -55,6 +56,7 @@ import com.epmet.modules.member.service.ResiGroupMemberService;
import com.epmet.modules.topic.entity.TopicShareLinkVisitRecordEntity;
import com.epmet.modules.topic.service.ResiTopicService;
import com.epmet.modules.topic.service.TopicShareLinkVisitRecordService;
import com.epmet.modules.topic.service.impl.ResiTopicServiceImpl;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.constant.EnterGroupTypeConstant;
import com.epmet.resi.group.constant.LeaderFlagConstant;
@ -393,9 +395,25 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
userIdList.add(groupMemberListResultDTO.getUserId());
}
ResiGroupEntity resiGroup = resiGroupDao.selectById(groupMemberListFormDTO.getGroupId());
if (null == resiGroup){
throw new RenException("此小组信息不存在");
}
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList);
if (CollectionUtils.isEmpty(userInfos)){
throw new RenException("查询用户信息失败了");
}
list.forEach(l -> {
userInfos.forEach(u -> {
if (l.getUserId().equals(u.getUserId())){
l.setUserShowName(u.getReleaseUserName());
l.setHeadPhoto(u.getReleaseUserHeadPhoto());
}
});
});
/*Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
if(userResiInfoDTOListResult.success()){
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
for (GroupMemberListResultDTO groupMember : list) {
@ -412,7 +430,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
ServiceConstant.EPMET_USER_SERVER,
userResiInfoDTOListResult.getCode(),
userResiInfoDTOListResult.getMsg()));
}
}*/
//徽章信息
ResiGroupEntity group = resiGroupDao.selectById(groupMemberListFormDTO.getGroupId());
if(null != group && StringUtils.isNotBlank(group.getCustomerId())){
@ -456,7 +474,23 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
}
UserResiInfoListFormDTO formDTO=new UserResiInfoListFormDTO();
formDTO.setUserIdList(userIdList);
Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
ResiGroupEntity resiGroup = resiGroupDao.selectById(applyingMemberFormDTO.getGroupId());
if (null == resiGroup){
throw new RenException("此小组信息不存在");
}
List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(resiGroup.getGroupType(), userIdList);
if (CollectionUtils.isEmpty(userInfos)){
throw new RenException("查询用户信息失败了");
}
list.forEach(l -> {
userInfos.forEach(u -> {
if (l.getApplyUserId().equals(u.getUserId())){
l.setApplyUserName(u.getReleaseUserName());
l.setApplyUserHeadPhoto(u.getReleaseUserHeadPhoto());
}
});
});
/*Result<List<UserResiInfoResultDTO>> userResiInfoDTOListResult=epmetUserFeignClient.getUserResiInfoList(formDTO);
if(userResiInfoDTOListResult.success()){
for (ApplyingMemberResultDTO memberInfo : list) {
for(UserResiInfoResultDTO userResiInfo:userResiInfoDTOListResult.getData()){
@ -469,7 +503,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
}
}else{
logger.warn(String.format("居民端组长【%s】查看入群待审核列表调用%s服务,获取用户头像显示昵称失败,错误码%s,错误提示%s",applyingMemberFormDTO.getUserId(), ServiceConstant.EPMET_USER_SERVER, userResiInfoDTOListResult.getCode(), userResiInfoDTOListResult.getMsg()));
}
}*/
//徽章信息

Write Preview
Loading…
Cancel
Save