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 { - 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("支付方式或支付名称已存在"); 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