From 2329a017b2fd71cbb390784b8701cd4017f3acea Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Wed, 9 Jul 2025 17:23:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=A0=E5=B0=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/service/impl/ShopBaseProductTypeServiceImpl.java  | 7 ++++++-
 .../shop/sync/controller/ProductMappingController.java     | 4 ++--
 .../mall/shop/sync/service/ProductMappingService.java      | 2 +-
 .../shop/sync/service/impl/ProductMappingServiceImpl.java  | 6 ++++--
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductTypeServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductTypeServiceImpl.java
index 58f0ae2e..9979ac6b 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductTypeServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/impl/ShopBaseProductTypeServiceImpl.java
@@ -10,6 +10,7 @@ import com.suisung.mall.common.modules.base.ShopBaseProductType;
 import com.suisung.mall.common.modules.product.ShopProductBase;
 import com.suisung.mall.common.modules.product.ShopProductIndex;
 import com.suisung.mall.common.utils.CheckUtil;
+import com.suisung.mall.common.utils.ContextUtil;
 import com.suisung.mall.common.utils.I18nUtil;
 import com.suisung.mall.common.utils.UserInfoService;
 import com.suisung.mall.core.web.service.impl.BaseServiceImpl;
@@ -80,7 +81,11 @@ public class ShopBaseProductTypeServiceImpl extends BaseServiceImpl<ShopBaseProd
 
     @Override
     public Map getType(String type_id) {
-        ShopBaseProductType shopBaseProductType = get(type_id);
+        String storeId = ContextUtil.getCurrentUser().getStore_id();
+        QueryWrapper<ShopBaseProductType> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("type_id", type_id);
+        queryWrapper.eq("store_id", storeId);
+        ShopBaseProductType shopBaseProductType = findOne(queryWrapper);
         Map data = new HashMap();
         data.put("assists", assistService.getAssistsByIds(shopBaseProductType.getType_assist_ids()));
         data.put("brands", brandService.getBrandsByIds(shopBaseProductType.getType_brand_ids()));
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java
index 2df3967e..c4b27c07 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/controller/ProductMappingController.java
@@ -196,8 +196,8 @@ public class ProductMappingController extends BaseControllerImpl {
      */
     @ApiOperation(value = "查找为同步的商品数据", notes = "删除查找为同步的商品数据")
     @RequestMapping(value = "/getSyncBaseMapingProducts", method = RequestMethod.GET)
-    public CommonResult getSyncBaseMapingProducts() {
-        return productMappingService.getSyncProductUnchecked();
+    public CommonResult getSyncBaseMapingProducts(Integer storeId) {
+        return productMappingService.getSyncProductUnchecked(storeId);
     }
 
     /**
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java
index 50d766e4..7a8f9cd5 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/ProductMappingService.java
@@ -21,7 +21,7 @@ public interface ProductMappingService extends IBaseService<ProductMapping> {
 
     CommonResult syncAllProductMapping();
 
-    CommonResult getSyncProductUnchecked();
+    CommonResult getSyncProductUnchecked(Integer storeId);
 
     // 下载导入模板
     void downloadTemplate(HttpServletResponse response);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
index f866487b..4f26a63c 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/ProductMappingServiceImpl.java
@@ -422,8 +422,10 @@ public class ProductMappingServiceImpl extends BaseServiceImpl<ProductMappingMap
     }
 
     @Override
-    public CommonResult getSyncProductUnchecked() {
-        Integer storeId= Integer.valueOf(Objects.requireNonNull(ContextUtil.getCurrentUser()).getStore_id());
+    public CommonResult getSyncProductUnchecked(Integer storeId) {
+        if(ObjectUtil.isNull(storeId)){
+            storeId= Integer.valueOf(Objects.requireNonNull(ContextUtil.getCurrentUser()).getStore_id());
+        }
         //找出范围内的规格产品
         QueryWrapper<ShopProductBase> queryWrapper=  new QueryWrapper<>();
         queryWrapper.eq("product_state_id", StateCode.PRODUCT_STATE_OFF_THE_SHELF_UNCHECK);