From 04962b0048e5514d423dae454c3a95a6c595b852 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Mon, 25 Aug 2025 14:25:17 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=AE=A2=E6=88=B7=E9=94=80?= =?UTF-8?q?=E5=94=AE=E7=AE=A1=E7=90=86=20=E6=89=B9=E9=87=8F=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=8A=9F=E8=83=BD=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...toreCustomerProductDiscountController.java | 13 +++++++--- .../StoreCusProdBatchDiscountDeleteVO.java | 25 +++++++++++++++++++ .../StoreCusProdBatchDiscountDeleteDTO.java | 23 +++++++++++++++++ .../IStoreCustomerProductDiscountService.java | 9 +++++++ ...oreCustomerProductDiscountServiceImpl.java | 18 +++++++++++++ 5 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java create mode 100644 xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java index de31e7115..56ba3d436 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreCustomerProductDiscountController.java @@ -6,10 +6,7 @@ import com.ruoyi.common.core.controller.XktBaseController; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.Page; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.StoreCusProdBatchDiscountVO; -import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.StoreCusProdDiscExistVO; -import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.StoreCusProdDiscPageVO; -import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.StoreCusProdDiscountVO; +import com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount.*; import com.ruoyi.web.controller.xkt.vo.storeProd.StoreProdSkuResVO; import com.ruoyi.xkt.dto.storeCusProdDiscount.*; import com.ruoyi.xkt.service.IStoreCustomerProductDiscountService; @@ -52,6 +49,14 @@ public class StoreCustomerProductDiscountController extends XktBaseController { return R.ok(storeCusProdDiscService.batchDiscount(BeanUtil.toBean(batchDiscVO, StoreCusProdBatchDiscountDTO.class))); } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") + @ApiOperation(value = "客户销售管理 批量删除", httpMethod = "PUT", response = R.class) + @Log(title = "客户销售管理 批量删除", businessType = BusinessType.UPDATE) + @DeleteMapping("/batch") + public R batchDiscountDelete(@Validated @RequestBody StoreCusProdBatchDiscountDeleteVO batchDiscDeleteVO) { + return R.ok(storeCusProdDiscService.batchDiscountDelete(BeanUtil.toBean(batchDiscDeleteVO, StoreCusProdBatchDiscountDeleteDTO.class))); + } + @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()") @ApiOperation(value = "查询客户销售管理列表", httpMethod = "POST", response = R.class) @PostMapping("/page") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java new file mode 100644 index 000000000..2e2d4f602 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteVO.java @@ -0,0 +1,25 @@ +package com.ruoyi.web.controller.xkt.vo.storeCusProdDiscount; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@ApiModel("档口客户批量删除") +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class StoreCusProdBatchDiscountDeleteVO { + + @NotNull(message = "ID列表不能为空!") + @ApiModelProperty(value = "ID列表", required = true) + private List storeCusProdDiscIdList; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java new file mode 100644 index 000000000..2b951fe2e --- /dev/null +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCusProdDiscount/StoreCusProdBatchDiscountDeleteDTO.java @@ -0,0 +1,23 @@ +package com.ruoyi.xkt.dto.storeCusProdDiscount; + +import com.fasterxml.jackson.annotation.JsonInclude; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author liujiang + * @version v1.0 + * @date 2025/3/27 15:12 + */ +@ApiModel("档口客户批量删除") +@Data +@JsonInclude(JsonInclude.Include.NON_NULL) +public class StoreCusProdBatchDiscountDeleteDTO { + + @ApiModelProperty(value = "ID列表") + private List storeCusProdDiscIdList; + +} diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerProductDiscountService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerProductDiscountService.java index 68a69c133..c4cad2947 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerProductDiscountService.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreCustomerProductDiscountService.java @@ -39,9 +39,18 @@ public interface IStoreCustomerProductDiscountService { /** * 客户销售管理，新增客户优惠时，判断是否已存在优惠 + * * @param existDTO 优惠是否存在DTO * @return StoreCusProdDiscExistResDTO */ List discountExist(StoreCusProdDiscExistDTO existDTO); + /** + * 批量优惠删除 + * + * @param deleteDTO 删除优惠入参 + * @return Integer + */ + Integer batchDiscountDelete(StoreCusProdBatchDiscountDeleteDTO deleteDTO); + } diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java index c043559c2..6c19f4f6d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java @@ -209,6 +209,24 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr return existResList; } + /** + * 批量删除客户优惠 + * @param deleteDTO 删除优惠入参 + * @return + */ + @Override + @Transactional + public Integer batchDiscountDelete(StoreCusProdBatchDiscountDeleteDTO deleteDTO) { + List discList = this.cusProdDiscMapper.selectList(new LambdaQueryWrapper() + .in(StoreCustomerProductDiscount::getId, deleteDTO.getStoreCusProdDiscIdList()) + .eq(StoreCustomerProductDiscount::getDelFlag, Constants.UNDELETED)); + if (CollectionUtils.isEmpty(discList)) { + return 0; + } + discList.forEach(x -> x.setDelFlag(Constants.DELETED)); + return this.cusProdDiscMapper.updateById(discList).size(); + } + /** * 新增档口客户 *