From 3c57954256fb25469247643e1a9bcdbe995963d5 Mon Sep 17 00:00:00 2001
From: "shuo.wang" <shuo.wang@hao168.com>
Date: Sat, 12 Oct 2024 22:35:09 +0800
Subject: [PATCH] fix

---
 .../main/java/com/cool/store/mapper/RegionMapper.java  |  2 ++
 .../src/main/resources/mapper/RegionMapper.xml         | 10 ++++++++++
 .../store/service/impl/PlatformBuildServiceImpl.java   |  8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
index df80b6d95..5c5d4c334 100644
--- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
+++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java
@@ -86,6 +86,8 @@ public interface RegionMapper {
 
     List<String> getSubRegionIdsByRegionIds( @Param("regionIds")List<String> regionIds);
 
+    List<Long> getSubRegionIdsByRegionIdList( @Param("regionIds")List<Long> regionIds);
+
     List<String> getStoreIdsByRegionIds( @Param("regionIds")List<String> regionIds);
 
     List<String> getSubIdsByRegionpaths( @Param("regionPaths")List<String> regionPaths);
diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
index 59fc125c8..15034bbab 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml
@@ -405,6 +405,16 @@
         where deleted = 0
         and syn_ding_dept_id = #{synDingDeptId}
     </select>
+    <select id="getSubRegionIdsByRegionIdList" resultType="java.lang.Long">
+        select
+        id
+        from
+        region_${enterpriseId}
+        where
+        deleted = 0
+        and
+        <foreach collection="regionIds" separator=" or " open="(" close=")" item="region" > region_path like concat("%/", #{region}, "/%")</foreach>
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
index d53884b46..6f6e592a1 100644
--- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
+++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PlatformBuildServiceImpl.java
@@ -11,6 +11,7 @@ import com.cool.store.enums.point.ShopSubStageEnum;
 import com.cool.store.enums.point.ShopSubStageStatusEnum;
 import com.cool.store.exception.ServiceException;
 import com.cool.store.mapper.ApplyLicenseMapper;
+import com.cool.store.mapper.RegionMapper;
 import com.cool.store.request.PlatformBuildAuditRequest;
 import com.cool.store.request.PlatformBuildRequest;
 import com.cool.store.request.platformBuildListRequest;
@@ -75,6 +76,8 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
     private EnterpriseUserDAO enterpriseUserDAO;
     @Autowired
     private PointInfoDAO pointInfoDAO;
+    @Autowired
+    private RegionMapper regionMapper;
 
     @Override
     public String juridicalIdCard(Long shopId) {
@@ -230,6 +233,11 @@ public class PlatformBuildServiceImpl implements PlatformBuildService {
         for (String regionId : regionIds) {
             regionIdList.add(Long.parseLong(regionId));
         }
+
+        List<Long> subRegionIdsByRegionIdList = regionMapper.getSubRegionIdsByRegionIdList(request.getRegionIds());
+        if (CollectionUtils.isNotEmpty(subRegionIdsByRegionIdList)) {
+            request.setRegionIds(subRegionIdsByRegionIdList);
+        }
         PageHelper.startPage(request.getPageNum(), request.getPageSize());
         List<PlatformBuildListResponse> responses = shopInfoDAO.platformBuildList(regionIdList, request);
         PageInfo<PlatformBuildListResponse> pageInfo = new PageInfo<>(responses);