用户统计与商家入驻统计优化

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/TeamDetailsDTO.java

@@ -35,6 +35,11 @@ public class TeamDetailsDTO implements Serializable {
      */
     private String name;
 
+    /**
+     * 邀请的用户头像
+     */
+    private String inviteUserAvatar;
+
     /**
      * 总金额
      */

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserInviteServiceImpl.java

@@ -126,25 +126,31 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         List<UserDTO> usersLists = this.userService.listUsers(userList);
         Map<Long, String> userMap = usersLists.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
         Map<Long, String> map = new HashMap<>();
+        Map<Long,String> avatar = new HashMap<>();
         if(param.getType() == null){
             List<Long> userIds = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<UserDTO> users = this.userService.listUsers(userIds);
             map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
+            avatar = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
             List<Long> merchantIds = records.stream().filter(e -> e.getSourceType() == 2).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<MerchantDTO> merchants = this.merchantService.getMerchantByIds(merchantIds);
             map.putAll(merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getName)));
+            avatar.putAll(merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getLogo)));
         } else if(param.getType() == 1){
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<UserDTO> users = this.userService.listUsers(ids);
             map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
+            avatar = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getAvatar));
         } else if(param.getType() == 2){
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<MerchantDTO> merchants = this.merchantService.getMerchantByIds(ids);
             map = merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getName));
+            avatar = merchants.stream().collect(Collectors.toMap(MerchantDTO::getId, MerchantDTO::getLogo));
         }
         for(TeamDetailsDTO detailsDTO : records){
             detailsDTO.setName(map.get(detailsDTO.getInviteUserId()));
             detailsDTO.setNickname(userMap.get(detailsDTO.getUserId()));
+            detailsDTO.setInviteUserAvatar(avatar.get(detailsDTO.getInviteUserId()));
             BigDecimal amount = detailsDTO.getAmount();
             if(amount == null){
                 detailsDTO.setAmount(BigDecimal.ZERO);