From c3b47e05c81ca3f1f8a5c7c906f50d81ecb86e14 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Thu, 10 Apr 2025 18:05:11 +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 --- .../java/com/czg/controller/admin/ProductController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 4ec8e214..15e9b155 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,7 +303,10 @@ public class ProductController { public CzgResult sync() { long shopId = StpKit.USER.getShopId(0L); long sysUserId = StpKit.USER.getLoginIdAsLong(); - Long headShopId = StpKit.USER.getHeadShopId(); + long headShopId = StpKit.USER.getHeadShopId(); + if(shopId == headShopId){ + throw new CzgException("不存在主店分店关系，无需同步"); + } ThreadUtil.execAsync(() -> { shopSyncService.sync(headShopId, shopId, sysUserId); }); @@ -327,5 +330,4 @@ public class ProductController { shopSyncService.syncConsProBySourceShop(shopId, id, sysUserId); }); } - }