组员列表、入群审核列表返回徽章列表

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/ApplyingMemberResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.resi.group.dto.member.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description
@@ -45,4 +46,9 @@ public class ApplyingMemberResultDTO implements Serializable {
 	 * 入群被拒 - rejected 、
 	 */
 	private String status;
+
+	/**
+	 * 用户徽章Url列表
+	 */
+	private List<String> badgeList;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/result/GroupMemberListResultDTO.java

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description
@@ -43,4 +44,9 @@ public class GroupMemberListResultDTO implements Serializable {
 	 * 审核通过 - approved、  已禁言 - silent
 	 */
 	private String status;
+
+	/**
+	 * 用户徽章列表
+	 */
+	private List<String> badgeList;
 }

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

@@ -31,12 +31,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ReadFlagConstant;
-import com.epmet.dto.form.UserMessageFormDTO;
-import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.dto.form.UserResiInfoListFormDTO;
-import com.epmet.dto.form.WxSubscribeMessageFormDTO;
+import com.epmet.dto.form.*;
 import com.epmet.dto.result.UserResiInfoResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
+import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.constant.GroupMemberConstant;
 import com.epmet.modules.constant.UserMessageConstant;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -65,6 +63,7 @@ import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.member.ResiGroupMemberInfoRedisDTO;
 import com.epmet.resi.group.dto.member.form.*;
+import com.epmet.resi.group.dto.member.form.CommonGridIdListFormDTO;
 import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
 import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO;
 import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
@@ -75,10 +74,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 群组成员关系表
@@ -118,6 +119,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 	private ResiGroupRedis resiGroupRedis;
 	@Autowired
 	private ResiGroupDao resiGroupDao;
+	@Autowired
+	private EpmetUserOpenFeignClient userOpenFeignClient;
 
 	@Override
 	public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
@@ -329,6 +332,24 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					userResiInfoDTOListResult.getCode(),
 					userResiInfoDTOListResult.getMsg()));
 		}
+		//徽章信息
+		ResiGroupEntity group = resiGroupDao.selectById(groupMemberListFormDTO.getGroupId());
+		if(null != group && StringUtils.isNotBlank(group.getCustomerId())){
+			Result<Map<String, List<UserBadgeUnitFormDTO>>> badgeR
+					= userOpenFeignClient.userShowBadge(new UserGroupFormDTO(group.getCustomerId(), userIdList));
+			if(null != badgeR && badgeR.success() && null != badgeR.getData() && !badgeR.getData().isEmpty()){
+				Map<String, List<UserBadgeUnitFormDTO>> map = badgeR.getData();
+				list.forEach(member -> {
+					member.setBadgeList(
+							CollectionUtils.isEmpty(map.get(member.getUserId())) ?
+									Collections.EMPTY_LIST:
+									map.get(member.getUserId()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList()) );
+				});
+			}else{
+				list.forEach(member -> member.setBadgeList(Collections.EMPTY_LIST));
+			}
+		}
+
 		return list;
 	}
 
@@ -368,6 +389,26 @@ 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()));
 		}
+
+
+		//徽章信息
+		ResiGroupEntity group = resiGroupDao.selectById(applyingMemberFormDTO.getGroupId());
+		if(null != group && StringUtils.isNotBlank(group.getCustomerId())){
+			Result<Map<String, List<UserBadgeUnitFormDTO>>> badgeR
+					= userOpenFeignClient.userShowBadge(new UserGroupFormDTO(group.getCustomerId(), userIdList));
+			if(null != badgeR && badgeR.success() && null != badgeR.getData() && !badgeR.getData().isEmpty()){
+				Map<String, List<UserBadgeUnitFormDTO>> map = badgeR.getData();
+				list.forEach(member -> {
+					member.setBadgeList(
+							CollectionUtils.isEmpty(map.get(member.getApplyUserId())) ?
+									Collections.EMPTY_LIST:
+									map.get(member.getApplyUserId()).stream().map(UserBadgeUnitFormDTO :: getBadgeIcon).collect(Collectors.toList()) );
+				});
+			}else{
+				list.forEach(member -> member.setBadgeList(Collections.EMPTY_LIST));
+			}
+		}
+
 		return list;
 	}