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 convertList(List shopInfoList) { + public static List convertList(List shopInfoList, Map stageMap ) { List 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 getShopList(Long lineId) { List shopList = shopInfoDAO.getShopList(lineId); - return MiniShopPageVO.convertList(shopList); + List shopIds = shopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); + List subStageList = shopStageInfoDAO.getSubStageList(shopIds, ShopSubStageEnum.SHOP_STAGE_8.getShopSubStage()); + Map stageMap = subStageList.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, Function.identity())); + return MiniShopPageVO.convertList(shopList,stageMap); } @Override