From 7e58b98e74c01afee468bb223d146036cc253096 Mon Sep 17 00:00:00 2001 From: Chopper Date: Tue, 2 Nov 2021 10:31:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=80=E4=B8=AA=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=AF=BC=E8=87=B4=E4=BC=98=E6=83=A0=E5=88=B8=E5=9C=A8?= =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=9D=A1=E4=BB=B6=E4=B8=8D=E6=BB=A1?= =?UTF-8?q?=E8=B6=B3=E5=B0=B1=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/cart/entity/dto/TradeDTO.java | 13 +++++++++++++ .../order/cart/render/impl/CouponRender.java | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index b6286359..cc072b28 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -19,6 +19,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 购物车视图 @@ -147,4 +148,16 @@ public class TradeDTO implements Serializable { public TradeDTO() { this(CartTypeEnum.CART); } + + /** + * 过滤购物车中已选择的sku + * + * @return + */ + public List getCheckedSkuList() { + if (skuList != null && !skuList.isEmpty()) { + return skuList.stream().filter(CartSkuVO::getChecked).collect(Collectors.toList()); + } + return skuList; + } } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java index cbb9f9f6..ad833422 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java @@ -103,7 +103,7 @@ public class CouponRender implements CartRenderStep { if (memberCoupon == null) { return; } - List filterSku = filterSkuVo(tradeDTO.getSkuList(), memberCoupon); + List filterSku = filterSkuVo(tradeDTO.getCheckedSkuList(), memberCoupon); if (filterSku == null || filterSku.isEmpty()) { tradeDTO.getCantUseCoupons().add(new MemberCouponVO(memberCoupon, "购物车中没有满足优惠券使用范围的优惠券"));