优化商家查询接口

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.uc.api.dto.UserDTO;
+import com.chelvc.cloud.uc.api.model.Scope;
 import com.chelvc.cloud.uc.api.service.UserService;
 import com.chelvc.cloud.vehicle.api.constant.PlatformConstant;
 import com.chelvc.cloud.vehicle.api.dto.MerchantDTO;
@@ -19,9 +20,12 @@ import com.chelvc.cloud.vehicle.server.entity.UserInvite;
 import com.chelvc.cloud.vehicle.server.entity.UserProfitRatio;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.UserProfitRatioService;
+import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.function.Executor;
 import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -31,6 +35,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -106,6 +111,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
 
     @Override
     public TeamDTO teamList(TeamInvitePageParam param, Long userId) {
+        param.setType(param.getSourceType());
         TeamDTO dto = new TeamDTO();
         Paging paging = param.getPaging();
         int pageNum = (paging.getNumber() - 1) * paging.getSize();
@@ -116,6 +122,9 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         if(CollectionUtils.isEmpty(records)){
             return dto;
         }
+        List<Long> userList = records.stream().map(TeamDetailsDTO::getUserId).collect(Collectors.toList());
+        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<>();
         if(param.getType() == null){
             List<Long> userIds = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
@@ -135,6 +144,7 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         }
         for(TeamDetailsDTO detailsDTO : records){
             detailsDTO.setName(map.get(detailsDTO.getInviteUserId()));
+            detailsDTO.setNickname(userMap.get(detailsDTO.getUserId()));
             BigDecimal amount = detailsDTO.getAmount();
             if(amount == null){
                 detailsDTO.setAmount(BigDecimal.ZERO);