From e94fbbf6d87953c97590dff3d033e891afd7ce74 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Tue, 27 May 2025 18:11:38 +0800
Subject: [PATCH] fix

---
 .../com/cool/store/service/impl/DataHandlerServerImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
index 3ee70fef2..0ac224030 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
@@ -914,6 +914,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
     @Transactional(rollbackFor = Exception.class)
     public Integer JingDongStageHandler() {
         List<ShopStageInfoDO> subStages = shopStageInfoDAO.getSubStages(ShopSubStageEnum.SHOP_STAGE_19.getShopSubStage());
+        List<ShopStageInfoDO> jdSubStages = shopStageInfoDAO.getSubStages(ShopSubStageEnum.SHOP_STAGE_25.getShopSubStage());
+        List<Long> jdStageShopIds = jdSubStages.stream().map(ShopStageInfoDO::getShopId).collect(Collectors.toList());
         Set<Long> lineIds = subStages.stream().map(ShopStageInfoDO::getLineId).collect(Collectors.toSet());
         List<LineInfoDO> lineInfoDOS = lineInfoDAO.getByLineIds(new ArrayList<>(lineIds));
         Map<Long, LineInfoDO> lineMap = lineInfoDOS.stream().collect(Collectors.toMap(LineInfoDO::getId, line -> line));
@@ -922,6 +924,9 @@ public class DataHandlerServerImpl implements DataHandlerServer {
         ShopSubStageEnum shopSubStageEnum = ShopSubStageEnum.SHOP_STAGE_25;
         List<Long> shopIds = shopAccountDAO.getShopId();
         for (ShopStageInfoDO shopStageInfoDO : subStages) {
+            if (jdStageShopIds.contains(shopStageInfoDO.getShopId())){
+                continue;
+            }
             LineInfoDO lineInfoDO = lineMap.get(shopStageInfoDO.getLineId());
             if (Objects.isNull(lineInfoDO)) {
                 log.info("线索不存在：{}", shopStageInfoDO.getShopId());