From 7499cee35e0690e7094b32348809e11c90a89ea8 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 17:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/ShopPayTypeController.java   | 15 ++++++++-------
 .../java/com/czg/account/dto/ShopPayTypeDTO.java  |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPayTypeController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPayTypeController.java
index af2081422..543aac0a3 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPayTypeController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopPayTypeController.java
@@ -1,6 +1,7 @@
 package com.czg.controller.admin;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.czg.account.dto.ShopPayTypeDTO;
 import com.czg.account.dto.paytype.ShopPayTypeAddDTO;
 import com.czg.account.entity.ShopPayType;
@@ -50,13 +51,13 @@ public class ShopPayTypeController {
     @PutMapping
     public CzgResult<Boolean> edit(@RequestBody ShopPayTypeDTO shopPayTypeDTO) {
         ShopPayType shopPayType = BeanUtil.copyProperties(shopPayTypeDTO, ShopPayType.class);
-        long count = shopPayTypeService.count(new QueryWrapper().eq(ShopPayType::getShopId, StpKit.USER.getShopId()).and(r -> {
-            r.eq(ShopPayType::getPayType, shopPayType.getPayType()).or(r1 -> {
-                r1.eq(ShopPayType::getPayName, shopPayType.getPayName());
-            });
-        }).ne(ShopPayType::getId, shopPayTypeDTO.getId()));
-        if (count > 0) {
-            throw new ApiNotPrintException("支付方式或支付名称已存在");
+        if (StrUtil.isNotBlank(shopPayTypeDTO.getPayName())) {
+            long count = shopPayTypeService.count(new QueryWrapper().eq(ShopPayType::getShopId, StpKit.USER.getShopId())
+                            .eq(ShopPayType::getPayName, shopPayTypeDTO.getPayName())
+                    .ne(ShopPayType::getId, shopPayTypeDTO.getId()));
+            if (count > 0) {
+                throw new ApiNotPrintException("支付方式或支付名称已存在");
+            }
         }
         return CzgResult.success(shopPayTypeService.update(shopPayType, new QueryWrapper().eq(ShopPayType::getId, shopPayTypeDTO.getId()).eq(ShopPayType::getShopId, StpKit.USER.getShopId())));
     }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java
index e3cd0be86..4a82484d1 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/ShopPayTypeDTO.java
@@ -33,6 +33,7 @@ public class ShopPayTypeDTO implements Serializable {
      * 是否快捷展示1是0否
      */
     private Integer isShowShortcut;
+    private String payName;
 
     /**
      * 0允许退款 1-不允许退款