From 3837f9e78767db62f225aa3744a2a7fe3fb076c4 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Thu, 4 Sep 2025 08:47:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=97=E9=93=BA=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ShopStoreBaseServiceImpl.java    | 15 ++++++++++++++-
 .../mapper/store/ShopStoreBaseMapper.xml          |  6 ++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
index f3f2375e..ce16a5bd 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
@@ -3046,7 +3046,20 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
         params.put("countyId", countyId);
         params.put("userLng", userLng);
         params.put("userLat", userLat);
-        params.put("storeCategoryId", storeCategoryId);
+        List<Integer>  storeCategoryIds=new ArrayList<>();
+        QueryWrapper<ShopBaseStoreCategory> storeCategoryQueryWrapper = new QueryWrapper<>();
+        storeCategoryQueryWrapper.eq("store_category_parent_id",storeCategoryId);
+        List<ShopBaseStoreCategory> shopBaseStoreCategories= shopBaseStoreCategoryService.list(storeCategoryQueryWrapper);
+        if(!shopBaseStoreCategories.isEmpty()){
+            storeCategoryIds.add(storeCategoryId);
+            shopBaseStoreCategories.forEach(shopBaseStoreCategory -> {
+                storeCategoryIds.add(shopBaseStoreCategory.getStore_category_id());
+            });
+            params.put("storeCategoryIds", storeCategoryIds);
+        }else {
+            params.put("storeCategoryId", storeCategoryId);
+        }
+
         params.put("subSiteId", subSiteId);
         params.put("storeName", storeName);
 
diff --git a/mall-shop/src/main/resources/mapper/store/ShopStoreBaseMapper.xml b/mall-shop/src/main/resources/mapper/store/ShopStoreBaseMapper.xml
index 1eadde13..c005d9b1 100644
--- a/mall-shop/src/main/resources/mapper/store/ShopStoreBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/store/ShopStoreBaseMapper.xml
@@ -131,6 +131,12 @@
             <if test="params.storeCategoryId!=null">
                 and b.store_category_id=#{params.storeCategoryId}
             </if>
+            <if test="params.storeCategoryIds!=null">
+                and b.store_category_id in
+                <foreach collection="params.storeCategoryIds" item="storeCategoryId" separator="," open="(" close=")">
+                    #{storeCategoryId}
+                </foreach>
+            </if>
 
             <if test="params.subSiteId!=null">
                 and b.subsite_id=#{params.subSiteId}