From 2f18f00aa089c3e3eaf1e04ef054f6c271e4ea56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= <zhuhong.su@coolcollege.cn>
Date: Fri, 17 Jan 2025 11:29:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=8A=A0=E7=9B=9F?=
 =?UTF-8?q?=E5=95=86=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/cool/store/dao/LineInfoDAO.java     | 8 ++++++++
 .../java/com/cool/store/vo/shop/ShopPointBaseInfoVO.java  | 5 ++++-
 .../com/cool/store/service/impl/PointServiceImpl.java     | 6 +++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
index 47eaaec28..2ab9200dc 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/LineInfoDAO.java
@@ -214,4 +214,12 @@ public class LineInfoDAO {
         return lineInfoMapper.getByLineIds(lineIds);
     }
 
+    public Map<Long, String> getUserNameMap(List<Long> lineIds){
+        if(CollectionUtils.isEmpty(lineIds)){
+            return Maps.newHashMap();
+        }
+        List<LineInfoDO> lineMobile = lineInfoMapper.getByLineIds(lineIds);
+        return lineMobile.stream().filter(o->StringUtils.isNotBlank(o.getMobile())).collect(Collectors.toMap(LineInfoDO::getId, LineInfoDO::getUsername, (k1, k2)-> k1));
+    }
+
 }
diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopPointBaseInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopPointBaseInfoVO.java
index c275b8c74..01c56ad45 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopPointBaseInfoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/ShopPointBaseInfoVO.java
@@ -25,6 +25,8 @@ public class ShopPointBaseInfoVO {
     @ApiModelProperty("门店ID")
     private Long shopId;
 
+    private String partnerName;
+
     @ApiModelProperty("门店名称")
     private String shopName;
 
@@ -55,12 +57,13 @@ public class ShopPointBaseInfoVO {
         this.mobile = mobile;
     }
 
-    public static List<ShopPointBaseInfoVO> convertList(List<ShopPointDTO> lineList, Map<String, String> userNameMap, Map<Long, String> userPortraitMap, Map<Long, HyOpenAreaInfoDO> cityMap, Map<Long, Integer> recommendShopNumMap){
+    public static List<ShopPointBaseInfoVO> convertList(Map<Long, String> partnerNameMap,List<ShopPointDTO> lineList, Map<String, String> userNameMap, Map<Long, String> userPortraitMap, Map<Long, HyOpenAreaInfoDO> cityMap, Map<Long, Integer> recommendShopNumMap){
         List<ShopPointBaseInfoVO> resultList = new ArrayList<>();
         for (ShopPointDTO shopPointDTO : lineList) {
             ShopPointBaseInfoVO shopPointBaseInfoVO = new ShopPointBaseInfoVO(shopPointDTO.getShopId(), shopPointDTO.getShopName(), shopPointDTO.getMobile());
             String username = userNameMap.get(shopPointDTO.getInvestmentManager());
             shopPointBaseInfoVO.setInvestmentManagerUsername(username);
+            shopPointBaseInfoVO.setPartnerName(partnerNameMap.get(shopPointDTO.getLineId()));
             HyOpenAreaInfoDO areaInfo = cityMap.get(shopPointDTO.getWantShopAreaId());
             if(Objects.nonNull(areaInfo)){
                 shopPointBaseInfoVO.setAreaName(areaInfo.getAreaName());
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
index 19e660e12..0f0d80727 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
@@ -469,7 +469,11 @@ public class PointServiceImpl implements PointService {
         Map<Long, HyOpenAreaInfoDO> cityMap = hyOpenAreaInfoDAO.getCityMap(wantShopAreaIds);
         Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(investmentManagerUserIds);
         Map<Long, String> userPortraitMap = labelService.getUserPortraitMap(userPortraitList);
-        List<ShopPointBaseInfoVO> resultList = ShopPointBaseInfoVO.convertList(listByDevelopmentManager, userNameMap, userPortraitMap, cityMap, recommendShopNumMap);
+
+        List<Long> lineIds = listByDevelopmentManager.stream().map(ShopPointDTO::getLineId).collect(Collectors.toList());
+        Map<Long, String> partnerNameMap = lineInfoDAO.getUserNameMap(lineIds);
+
+        List<ShopPointBaseInfoVO> resultList = ShopPointBaseInfoVO.convertList(partnerNameMap,listByDevelopmentManager, userNameMap, userPortraitMap, cityMap, recommendShopNumMap);
         PageInfo resultPage = new PageInfo(listByDevelopmentManager);
         resultPage.setList(resultList);
         return resultPage;