From 5b6852b00f4af4a7d3c1c962bd69ac4c3c46c3d1 Mon Sep 17 00:00:00 2001
From: liyj <1617420630@qq.com>
Date: Tue, 22 Jul 2025 09:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E5=94=AF?=
 =?UTF-8?q?=E4=B8=80=E5=80=BC=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/shop/base/service/ShopBaseProductTypeService.java     | 2 +-
 .../shop/base/service/impl/ShopBaseProductTypeServiceImpl.java | 3 ++-
 .../mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductTypeService.java b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductTypeService.java
index 9558cd5f..651793e9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductTypeService.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/base/service/ShopBaseProductTypeService.java
@@ -27,5 +27,5 @@ public interface ShopBaseProductTypeService extends IBaseService<ShopBaseProduct
      * @param typeName
      * @return
      */
-    ShopBaseProductType getProductTypeByName(String typeName);
+    ShopBaseProductType getProductTypeByName(String typeName,String storeId);
 }
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 9979ac6b..d5a26bb3 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
@@ -128,9 +128,10 @@ public class ShopBaseProductTypeServiceImpl extends BaseServiceImpl<ShopBaseProd
      * @return
      */
     @Override
-    public ShopBaseProductType getProductTypeByName(String typeName) {
+    public ShopBaseProductType getProductTypeByName(String typeName,String storeId) {
         QueryWrapper<ShopBaseProductType> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type_name", typeName);
+        queryWrapper.eq("store_id", Integer.valueOf(storeId));
         return getOne(queryWrapper);
     }
 }
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java
index a7f8f28b..2a1e1480 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sync/service/impl/SyncBaseThirdSxAbstract.java
@@ -149,7 +149,7 @@ public abstract class SyncBaseThirdSxAbstract{
                 Integer typeId = 1001;
 
                 if (StrUtil.isNotBlank(o.getStr("product_type"))) {
-                     productType = productTypeService.getProductTypeByName(o.getStr("product_type"));
+                     productType = productTypeService.getProductTypeByName(o.getStr("product_type"),storeId);
                     if (productType != null) {
                         typeId = productType.getType_id();
                     } else {