BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：更新优惠时，如果优惠为0，则置为无效；

pull/1121/head
liujiang 2025-10-25 13:35:31 +08:00
parent fba6462c0e
commit 82570399fa
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeSale/StoreSaleResVO.java
View File

@ -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;

7
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCustomerProductDiscountServiceImpl.java
View File

@ -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();
}