From 40954814114b853a8d02028b535697a9a368f953 Mon Sep 17 00:00:00 2001 From: Chopper Date: Thu, 7 Apr 2022 10:19:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BF=83=E9=94=80=E8=BF=90?= =?UTF-8?q?=E7=AE=97=E6=97=B6=EF=BC=8C=E4=BC=98=E6=83=A0=E5=88=B8=E4=BC=9A?= =?UTF-8?q?=E8=A2=AB=E7=BC=93=E5=AD=98=EF=BC=8C=E5=8F=AF=E8=83=BD=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/order/cart/render/impl/CouponRender.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 f06633e7..9eb7f01e 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 @@ -19,10 +19,7 @@ import cn.lili.modules.promotion.service.MemberCouponService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -62,6 +59,10 @@ public class CouponRender implements CartRenderStep { private void renderCouponRule(TradeDTO tradeDTO) { List memberCouponList = memberCouponService.getMemberCoupons(tradeDTO.getMemberId()); + memberCouponList = memberCouponList.stream() + .filter(item -> item.getStartTime().before(new Date()) && item.getEndTime().after(new Date())) + .collect(Collectors.toList()); + if (!memberCouponList.isEmpty()) { this.checkMemberExistCoupon(tradeDTO, memberCouponList); } else {