From 97b145e0f684432ab610a658cae44e59564807ba 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:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/ShopPayTypeController.java | 15 +++-------- .../com/czg/account/dto/ShopPayTypeDTO.java | 1 + .../dto/paytype/ShopPayTypeAddDTO.java | 5 ++++ .../account/service/ShopPayTypeService.java | 2 ++ .../service/impl/ShopPayTypeServiceImpl.java | 27 +++++++++++++++++++ 5 files changed, 39 insertions(+), 11 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 543aac0a..00cc4d0d 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 @@ -10,8 +10,10 @@ import com.czg.annotation.SaAdminCheckPermission; import com.czg.exception.ApiNotPrintException; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.czg.validator.group.InsertGroup; import com.mybatisflex.core.query.QueryWrapper; import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -50,16 +52,7 @@ public class ShopPayTypeController { @SaAdminCheckPermission(value = "shopPayType:edit", name = "支付方式编辑") @PutMapping public CzgResult edit(@RequestBody ShopPayTypeDTO shopPayTypeDTO) { - ShopPayType shopPayType = BeanUtil.copyProperties(shopPayTypeDTO, ShopPayType.class); - 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()))); + return CzgResult.success(shopPayTypeService.edit(StpKit.USER.getShopId(), shopPayTypeDTO)); } /** @@ -67,7 +60,7 @@ public class ShopPayTypeController { */ @SaAdminCheckPermission(value = "shopPayType:save", name = "支付方式添加") @PostMapping - public CzgResult add(@RequestBody ShopPayTypeAddDTO shopPayTypeAddDTO) { + public CzgResult add(@RequestBody @Validated(InsertGroup.class) ShopPayTypeAddDTO shopPayTypeAddDTO) { ShopPayType shopPayType = BeanUtil.copyProperties(shopPayTypeAddDTO, ShopPayType.class); return CzgResult.success(shopPayTypeService.add(StpKit.USER.getShopId(),shopPayType)); } 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 4a82484d..8c0bdbf5 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 @@ -34,6 +34,7 @@ public class ShopPayTypeDTO implements Serializable { */ private Integer isShowShortcut; private String payName; + private String payType; /** * 0允许退款 1-不允许退款 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java index ab6baaea..1266cac5 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/paytype/ShopPayTypeAddDTO.java @@ -1,6 +1,9 @@ package com.czg.account.dto.paytype; +import com.czg.validator.group.InsertGroup; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,10 +27,12 @@ public class ShopPayTypeAddDTO { /** * 支付类型 cash,alipay,weixin,deposit,arrears,virtual,member-account */ + @NotEmpty(message = "支付方式不为空", groups = InsertGroup.class) private String payType; /** * 支付名称 */ + @NotEmpty(message = "支付名称不为空", groups = InsertGroup.class) private String payName; /** diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java index a5f9e4a1..e9f5e486 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPayTypeService.java @@ -1,5 +1,6 @@ package com.czg.account.service; +import com.czg.account.dto.ShopPayTypeDTO; import com.mybatisflex.core.service.IService; import com.czg.account.entity.ShopPayType; @@ -17,4 +18,5 @@ public interface ShopPayTypeService extends IService { Boolean add(Long shopId, ShopPayType shopPayType); + Boolean edit(Long shopId, ShopPayTypeDTO shopPayTypeDTO); } 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 2dbbef31..1b477a7e 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 @@ -1,7 +1,10 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; +import com.czg.account.dto.ShopPayTypeDTO; import com.czg.exception.ApiNotPrintException; +import com.czg.resp.CzgResult; import com.czg.sa.StpKit; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -58,4 +61,28 @@ public class ShopPayTypeServiceImpl extends ServiceImpl 0) { + throw new ApiNotPrintException("支付名称已存在"); + } + } + + if (StrUtil.isNotBlank(shopPayTypeDTO.getPayType())) { + long count = count(new QueryWrapper().eq(ShopPayType::getShopId, shopId) + .eq(ShopPayType::getPayType, shopPayTypeDTO.getPayType()) + .ne(ShopPayType::getId, shopPayTypeDTO.getId())); + if (count > 0) { + throw new ApiNotPrintException("支付方式已存在"); + } + } + + return update(shopPayType, new QueryWrapper().eq(ShopPayType::getId, shopPayTypeDTO.getId()).eq(ShopPayType::getShopId, shopId)); + } }