code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao
2022-04-07 14:32:12 +08:00
parent 8e30defa0e db8796df99
commit 63fff2398e
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java
View File

@@ -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<MemberCoupon> 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 {