From 82570399fa6562c66a10c0b38767e199cd17aad1 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Sat, 25 Oct 2025 13:35:31 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=9B=B4=E6=96=B0=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E4=B8=BA0=EF=BC=8C=E5=88=99=E7=BD=AE=E4=B8=BA=E6=97=A0?= =?UTF-8?q?=E6=95=88=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/xkt/vo/storeSale/StoreSaleResVO.java | 2 +- .../impl/StoreCustomerProductDiscountServiceImpl.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java index dd38d9dec..7a18376a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java @@ -30,7 +30,7 @@ public class StoreSaleResVO { private Long storeCusId; @ApiModelProperty(value = "档口客户名称") private String storeCusName; - @ApiModelProperty(value = "销售类型（销售 1、退货 2、销售/退货 3）") + @ApiModelProperty(value = "销售类型（1、销售 2、退货 3、销售/退货）") private Integer saleType; @ApiModelProperty(value = "支付方式（1支付宝、2微信、3现金、4欠款）") private Integer payWay; 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 ce2e9b927..b2a588773 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 @@ -23,10 +23,7 @@ import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -142,6 +139,8 @@ public class StoreCustomerProductDiscountServiceImpl implements IStoreCustomerPr if (CollectionUtils.isEmpty(updateList)) { return 0; } + // 如果是discount为0，则将该优惠置为无效 + updateList.stream().filter(x -> Objects.equals(ObjectUtils.defaultIfNull(x.getDiscount(), 0), 0)).forEach(x -> x.setDelFlag(Constants.DELETED)); return this.cusProdDiscMapper.insertOrUpdate(updateList).size(); }