From 3047eb65cdfca5a02979ade55229b442c02cb304 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Fri, 27 Jun 2025 11:06:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=BE=85=E5=8A=9E=E7=9D=A3=E5=AF=BC?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=EF=BC=8C=E8=AE=A2=E8=B4=A7=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E4=BA=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cool/store/service/impl/DeskServiceImpl.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
index c5ba02c72..5ef7cfbe3 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java
@@ -756,7 +756,7 @@ public class DeskServiceImpl implements DeskService {
         List<PlanLineDTO> lines = lineInfoDAO.getLines(lineIds);
 
         List<Long> pointId = shopInfoList.stream().filter(x -> Objects.nonNull(x.getPointId())).map(ShopInfoDO::getPointId).collect(Collectors.toList());
-
+        List<String> investmentUserIds = shopInfoList.stream().map(ShopInfoDO::getInvestmentManager).collect(Collectors.toList());
         List<PointInfoDO> pointListByIds = pointInfoDAO.getPointListByIds(pointId);
         Map<Long, PointInfoDO> pointMap = pointListByIds.stream().collect(Collectors.toMap(PointInfoDO::getId, Function.identity()));
         //将shopInfoList 转为map
@@ -769,7 +769,10 @@ public class DeskServiceImpl implements DeskService {
 
         List<Long> regionIds = shopInfoList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList());
         List<String> developmentManagers = shopInfoList.stream().filter(x -> StringUtil.isNotEmpty(x.getShopManagerUserId())).map(ShopInfoDO::getShopManagerUserId).distinct().collect(Collectors.toList());
-        Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
+        Set<String> userIds = new HashSet<>();
+        userIds.addAll(investmentUserIds);
+        userIds.addAll(developmentManagers);
+        Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(new ArrayList<>(userIds));
         Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
         List<ShopStageRemarkInfoDO> remarkInfoDOList = shopStageRemarkInfoDAO.getByShopIdsAndStage(shopIds, subStageStatusList);
         Map<Long, ShopStageRemarkInfoDO> remarkInfoMap = remarkInfoDOList.stream().collect(Collectors.toMap(ShopStageRemarkInfoDO::getShopId, Function.identity()));
@@ -782,6 +785,7 @@ public class DeskServiceImpl implements DeskService {
             preparationCommonPendingVO.setStoreType(shopInfoDO.getStoreType());
             preparationCommonPendingVO.setJoinMode(shopInfoDO.getJoinMode());
             preparationCommonPendingVO.setShopAddress(shopInfoDO.getDetailAddress());
+            preparationCommonPendingVO.setInvestmentManager(userNameMap.get(shopInfoDO.getInvestmentManager()));
             preparationCommonPendingVO.setSignType(signTypeMap.getOrDefault(x.getShopId(), new SignFranchiseDO()).getSignType());
             preparationCommonPendingVO.setShopCode(shopInfoDO.getShopCode());
             preparationCommonPendingVO.setLineId(shopInfoDO.getLineId());