From 04f9457916725dd53d84b2197f84655e983eb0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 4 Mar 2025 16:07:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AD=98=E9=85=92=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/service/impl/ShopStorageGoodServiceImpl.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopStorageGoodServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopStorageGoodServiceImpl.java
index 71756e947..3ce962a3c 100644
--- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopStorageGoodServiceImpl.java
+++ b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopStorageGoodServiceImpl.java
@@ -51,7 +51,7 @@ public class ShopStorageGoodServiceImpl extends ServiceImpl<ShopStorageGoodMappe
     public Boolean saveInfo(Long shopId, ShopStorageGoodDTO shopStorageGoodDTO) {
         ShopStorageGood shopStorageGood = BeanUtil.copyProperties(shopStorageGoodDTO, ShopStorageGood.class);
         if (shopStorageGoodDTO.getSource() == 1) {
-            Product product = productService.getOne(new QueryWrapper().eq(Product::getShopId, shopId).eq(Product::getId, shopStorageGoodDTO.getId()));
+            Product product = productService.getOne(new QueryWrapper().eq(Product::getShopId, shopId).eq(Product::getId, shopStorageGoodDTO.getProdId()));
             if (product == null) {
                 throw new ApiNotPrintException("商品不存在");
             }

From 51743ff067b0f494a5c1dae801c9714422bb797f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Tue, 4 Mar 2025 16:19:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/service/impl/ShopPayTypeServiceImpl.java        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
index 80c5cfd96..2dbbef312 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPayTypeServiceImpl.java
@@ -45,8 +45,10 @@ public class ShopPayTypeServiceImpl extends ServiceImpl<ShopPayTypeMapper, ShopP
 
     @Override
     public Boolean add(Long shopId, ShopPayType shopPayType) {
-        long count = count(new QueryWrapper().eq(ShopPayType::getPayType, shopPayType.getPayType()).or(r -> {
-            r.eq(ShopPayType::getPayName, shopPayType.getPayName());
+        long count = count(new QueryWrapper().eq(ShopPayType::getShopId, shopId).and(r -> {
+            r.eq(ShopPayType::getPayType, shopPayType.getPayType()).or(r1 -> {
+                r1.eq(ShopPayType::getPayName, shopPayType.getPayName());
+            });
         }));
         if (count > 0) {
             throw new ApiNotPrintException("支付方式或支付名称已存在");