From f7e3ef7679ac393e37487e5eb1b3ea358140fc0d Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Wed, 9 Oct 2024 16:25:48 +0800
Subject: [PATCH] =?UTF-8?q?shopList=E5=A2=9E=E5=8A=A0=E8=83=BD=E5=90=A6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9shopCode=20=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cool/store/vo/shop/MiniShopPageVO.java    | 21 ++++++++++++++++---
 .../store/service/impl/ShopServiceImpl.java   |  6 +++++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java
index 200ec0863..8f6607c83 100644
--- a/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/shop/MiniShopPageVO.java
@@ -1,11 +1,15 @@
 package com.cool.store.vo.shop;
 
 import com.cool.store.entity.ShopInfoDO;
+import com.cool.store.entity.ShopStageInfoDO;
+import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * @author zhangchenbiao
@@ -25,16 +29,27 @@ public class MiniShopPageVO {
     @ApiModelProperty("店铺编码")
     private String shopCode;
 
-    public MiniShopPageVO(Long shopId, String shopName,String shopCode) {
+    @ApiModelProperty("加盟合同签约完成标识，0-未完成，1-完成")
+    private Boolean flag;
+
+    public MiniShopPageVO(Long shopId, String shopName,String shopCode,Boolean flag) {
         this.shopId = shopId;
         this.shopName = shopName;
         this.shopCode = shopCode;
+        this.flag = flag;
     }
 
-    public static List<MiniShopPageVO> convertList(List<ShopInfoDO> shopInfoList) {
+    public static List<MiniShopPageVO> convertList(List<ShopInfoDO> shopInfoList, Map<Long, ShopStageInfoDO> stageMap ) {
         List<MiniShopPageVO> resultList = new ArrayList<>();
         for (ShopInfoDO shopInfo : shopInfoList) {
-            resultList.add(new MiniShopPageVO(shopInfo.getId(), shopInfo.getShopName(),shopInfo.getShopCode()));
+            ShopStageInfoDO stageInfoDO = stageMap.get(shopInfo.getId());
+            Boolean flag = Boolean.FALSE;
+            if (Objects.nonNull(stageInfoDO)) {
+                if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_84.getShopSubStageStatus().equals(stageInfoDO.getShopSubStageStatus())) {
+                    flag = Boolean.TRUE;
+                }
+            }
+            resultList.add(new MiniShopPageVO(shopInfo.getId(), shopInfo.getShopName(),shopInfo.getShopCode(),flag));
         }
         return resultList;
     }
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
index 29d8266e3..72b70412f 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -92,7 +93,10 @@ public class ShopServiceImpl implements ShopService {
     @Override
     public List<MiniShopPageVO> getShopList(Long lineId) {
         List<ShopInfoDO> shopList = shopInfoDAO.getShopList(lineId);
-        return MiniShopPageVO.convertList(shopList);
+        List<Long> shopIds = shopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
+        List<ShopStageInfoDO> subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage());
+        Map<Long, ShopStageInfoDO> stageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, Function.identity()));
+        return MiniShopPageVO.convertList(shopList,stageMap);
     }
 
     @Override