From 8687a295c0608f876163be0e804fdb8fc94b34d7 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Mon, 29 Sep 2025 10:51:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=88=86=E7=B1=BB=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8C=89=E5=AD=90=E7=B1=BB=E6=9F=A5=E8=AF=A2=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ShopBaseStoreCategoryServiceImpl.java     |  3 +-
 .../impl/ShopStoreBaseServiceImpl.java        | 59 ++++++++-----------
 2 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseStoreCategoryServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseStoreCategoryServiceImpl.java
index 2ac3ad33..d1591c8f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseStoreCategoryServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseStoreCategoryServiceImpl.java
@@ -89,7 +89,8 @@ public class ShopBaseStoreCategoryServiceImpl extends BaseServiceImpl<ShopBaseSt
                         RequestContextHolder.setRequestAttributes(requestAttributes, true);
                         Integer store_category_id = (Integer) category_row.get("store_category_id");
                         Map<String, Object> row = new HashMap<>();
-                        row.put("store_category_id", String.valueOf(store_category_id));
+                        row.put("store_category_id", String.valueOf(store_category_parent_id));
+                        row.put("store_2nd_category_id", String.valueOf(store_category_id));
                         row.put("findStore", true);
                         row.put("store_type", "1");
                         Map storeListMap = shopStoreBaseService.getStoreList(1, pageSize, row);
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 2d696425..97a28e00 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
@@ -736,12 +736,18 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
 
         Integer store_id = getParameter("store_id", Integer.class);
         Integer store_category_id = getParameter("store_category_id", Integer.class);
+        Integer store_2nd_category_id = getParameter("store_2nd_category_id", Integer.class);
         boolean findStore = MapUtils.getBoolean(paramsMap, "findStore", false);
         if (ObjectUtil.isNull(store_category_id)) {
             if (null != paramsMap.get("store_category_id")) {
                 store_category_id = MapUtils.getInteger(paramsMap, "store_category_id");
             }
         }
+        if (ObjectUtil.isNull(store_2nd_category_id)) {
+            if (null != paramsMap.get("store_2nd_category_id")) {
+                store_2nd_category_id = MapUtils.getInteger(paramsMap, "store_2nd_category_id");
+            }
+        }
         Long distance = getParameter("distance", Long.class);
         if (CheckUtil.isEmpty(distance)) {
             distance = 20000000000L;
@@ -780,28 +786,13 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
         }
 
         if (CheckUtil.isNotEmpty(store_category_id)) {
-            List<Integer> store_category_ids = new ArrayList<>();
-            QueryWrapper<ShopBaseStoreCategory> storeCategoryQueryWrapper = new QueryWrapper<>();
-            storeCategoryQueryWrapper.eq("store_category_parent_id", store_category_id);
-            storeCategoryQueryWrapper.select("store_category_id");
-            List<ShopBaseStoreCategory> shopBaseStoreCategories = shopBaseStoreCategoryService.list(storeCategoryQueryWrapper);
-            store_category_ids.add(store_category_id);
-            for (ShopBaseStoreCategory storeCategory : shopBaseStoreCategories) {
-                store_category_ids.add(storeCategory.getStore_category_id());
-            }
-            if (store_category_ids.size() > 1) {
-                queryWrapper.and(q->{
-                    q.in("store_category_id",store_category_ids);
-                    q.or().in("store_2nd_category_id",store_category_ids);
-                });
-            } else {
-                queryWrapper.or(q->{
-                    q.eq("store_category_id",store_category_ids);
-                    q.or().eq("store_2nd_category_id",store_category_ids);
-                });
-            }
+            queryWrapper.eq("store_category_id",store_category_id);
             params.put("store_category_id", store_category_id);
         }
+        if(CheckUtil.isNotEmpty(store_2nd_category_id)){
+            queryWrapper.eq("store_2nd_category_id",store_2nd_category_id);
+        }
+
 
         queryWrapper.eq("store_is_open", 1);
         params.put("store_is_open", 1);
@@ -3100,20 +3091,20 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
         params.put("countyId", countyId);
         params.put("userLng", userLng);
         params.put("userLat", userLat);
-        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);
-        }
-
+//        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("storeCategoryId", storeCategoryId);
         params.put("subSiteId", subSiteId);
         params.put("storeName", storeName);