From be61a9dfea0e348d2e32a96a2424b5be7c057b5e Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Fri, 11 Apr 2025 11:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=BA=97=E9=93=BA=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=20=E2=88=9A=20=E4=B8=8B=E5=8D=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=20=E2=88=9A=20=E6=B3=A8=E5=86=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=20=E2=88=9A=20=E5=AE=8C=E5=96=84=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=20=E2=88=9A=20=E4=BC=9A=E5=91=98=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=90=8C=E6=AD=A5=20=E2=88=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/controller/admin/ProductController.java | 10 +++++++---
 .../src/main/java/com/czg/sa/MyStpLogic.java        | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
index b18425029..3aaa40506 100644
--- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
+++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
@@ -303,9 +303,13 @@ public class ProductController {
     public CzgResult<Void> sync() {
         long shopId = StpKit.USER.getShopId(0L);
         long sysUserId = StpKit.USER.getLoginIdAsLong();
-        long headShopId = StpKit.USER.getVipHeadShopId();
-        if(shopId == headShopId){
-            throw new CzgException("不存在主店分店关系，无需同步");
+        boolean isEnableSync = StpKit.USER.isEnableSync(shopId);
+        long headShopId = StpKit.USER.getHeadShopId();
+        if (!isEnableSync) {
+            throw new CzgException("主店未开启商品资料同步功能");
+        }
+        if (shopId == headShopId) {
+            throw new CzgException("不存在主子店铺关系，无需同步商品信息");
         }
         ThreadUtil.execAsync(() -> {
             shopSyncService.sync(headShopId, shopId, sysUserId);
diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
index ae441e305..afcc9a12b 100644
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
@@ -242,6 +242,19 @@ public class MyStpLogic {
         return shopId;
     }
 
+    /**
+     * 是否启用同步功能
+     * @param shopId 店铺id
+     * @return 主店id
+     */
+    public boolean isEnableSync(Long shopId) {
+        Integer isEnableProdSync = DbChain.table("tb_shop_config").select("is_enable_prod_sync").where("id = ?", shopId).objAs(Integer.class);
+        if (isEnableProdSync == null) {
+            return false;
+        }
+        return isEnableProdSync == 1;
+    }
+
     /**
      * 校验是否为管理端登录
      */