From 66c8099c94aa0fc645bbd27850168f9782f80a77 Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Tue, 4 Jun 2024 17:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=A7=9F=E8=B5=81=E5=90=88?=
 =?UTF-8?q?=E5=90=8C=E6=89=80=E5=B1=9E=E5=A4=A7=E5=8C=BA=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cool/store/vo/shop/RentInfoToDoVO.java     | 14 +++++++++-----
 .../cool/store/service/impl/PointServiceImpl.java  |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java
index 42a90de15..9ecaeb584 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/RentInfoToDoVO.java
@@ -1,6 +1,7 @@
 package com.cool.store.vo.shop;
 
 import com.cool.store.entity.PointInfoDO;
+import com.cool.store.entity.ShopInfoDO;
 import com.google.common.collect.Lists;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -44,20 +45,23 @@ public class RentInfoToDoVO {
     @ApiModelProperty("提交时间")
     private Date submitTime;
 
-    public static List<RentInfoToDoVO> convert(List<RentInfoToDoVO> list, Map<Long, Long> shopPointMap, Map<Long, PointInfoDO> pointMap, Map<Long, String> regionNameMap, Map<Long, Date> rentContractSubmitTimeMap){
+    public static List<RentInfoToDoVO> convert(List<RentInfoToDoVO> list, Map<Long, ShopInfoDO> shopPointMap, Map<Long, PointInfoDO> pointMap, Map<Long, String> regionNameMap, Map<Long, Date> rentContractSubmitTimeMap){
         if(CollectionUtils.isEmpty(list)){
             return Lists.newArrayList();
         }
         List<RentInfoToDoVO> resultList = new ArrayList<>();
         for (RentInfoToDoVO rent : list) {
-            Long pointId = shopPointMap.get(rent.getShopId());
-            rent.setPointId(pointId);
-            PointInfoDO pointInfo = pointMap.get(pointId);
+            ShopInfoDO shopInfo = shopPointMap.get(rent.getShopId());
+            if(Objects.isNull(shopInfo)){
+                continue;
+            }
+            PointInfoDO pointInfo = pointMap.get(shopInfo.getPointId());
             if(Objects.nonNull(pointInfo)){
                 rent.setPointName(pointInfo.getPointName());
                 rent.setAddress(pointInfo.getAddress());
-                rent.setRegionNodeName(regionNameMap.get(pointInfo.getRegionId()));
             }
+            rent.setPointId(shopInfo.getPointId());
+            rent.setRegionNodeName(regionNameMap.get(shopInfo.getRegionId()));
             rent.setSubmitTime(rentContractSubmitTimeMap.get(rent.getShopId()));
             resultList.add(rent);
         }
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 0e39b4f7f..577f6d227 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
@@ -1035,7 +1035,7 @@ public class PointServiceImpl implements PointService {
         if(Objects.nonNull(todoPage) && CollectionUtils.isNotEmpty(todoPage.getResult())){
             List<Long> shopIds = todoPage.getResult().stream().map(RentInfoToDoVO::getShopId).collect(Collectors.toList());
             List<ShopInfoDO> shopList = shopInfoDAO.getShopListByIds(shopIds);
-            Map<Long, Long> shopPointMap = shopList.stream().collect(Collectors.toMap(k->k.getId(), v->v.getPointId()));
+            Map<Long, ShopInfoDO> shopPointMap = shopList.stream().collect(Collectors.toMap(k->k.getId(), Function.identity()));
             List<Long> regionIds = shopList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList());
             List<Long> pointIds = shopList.stream().map(ShopInfoDO::getPointId).collect(Collectors.toList());
             List<PointInfoDO> pointList = pointInfoDAO.getPointListByIds(pointIds);