From 84914553d09c8a7fadaddd95689c7ae80d809d14 Mon Sep 17 00:00:00 2001
From: Tankaikai <tankaikai@aliyun.com>
Date: Sun, 16 Feb 2025 13:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/czg/product/dto/ShopProdUnitDTO.java      | 2 +-
 .../product/service/impl/ShopProdCategoryServiceImpl.java       | 1 +
 .../service/product/service/impl/ShopProdUnitServiceImpl.java   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java
index e98d8fd1..0d563ff1 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java
@@ -48,7 +48,7 @@ public class ShopProdUnitDTO implements Serializable {
     /**
      * 店铺id
      */
-    private String shopId;
+    private Long shopId;
     /**
      * 创建时间
      */
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
index 25f41ba2..01ff541a 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java
@@ -78,6 +78,7 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMap
     @Override
     public boolean updateShopProdCategory(ShopProdCategoryDTO dto) {
         Long shopId = StpKit.USER.getLoginIdAsLong();
+        dto.setShopId(shopId);
         boolean exists = super.exists(query().eq(ShopProdCategory::getName, dto.getName()).eq(ShopProdCategory::getShopId, shopId).ne(ShopProdCategory::getId, dto.getId()));
         if (exists) {
             throw new CzgException("商品分类已存在");
diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
index 4ed925e8..eefa28ec 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java
@@ -80,6 +80,7 @@ public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, Sho
     @Override
     public boolean updateShopProdUnit(ShopProdUnitDTO dto) {
         Long shopId = StpKit.USER.getLoginIdAsLong();
+        dto.setShopId(shopId);
         boolean exists = super.exists(query().eq(ShopProdUnit::getName, dto.getName()).eq(ShopProdUnit::getShopId, shopId).ne(ShopProdUnit::getId, dto.getId()));
         if (exists) {
             throw new CzgException("单位名称已存在");