From 62ad53f3c66ccaacbf29b7fdc1a7b950e61d8c28 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 09 Apr 2024 17:59:00 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
index d4b1453..b72a506 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java
@@ -320,7 +320,7 @@
});
LambdaQueryWrapper<MallVipBenefitsRecord> recordQuery = new LambdaQueryWrapper<>();
- recordQuery.eq(MallVipBenefitsRecord::getReceiveId, ids)
+ recordQuery.in(MallVipBenefitsRecord::getReceiveId, ids)
.ge(MallVipBenefitsRecord::getReceiveTime, DateUtil.beginOfDay(new Date()))
.le(MallVipBenefitsRecord::getReceiveTime, DateUtil.endOfDay(new Date()));
List<MallVipBenefitsRecord> hasRecieveList = mallVipBenefitsRecordMapper.selectList(recordQuery);
@@ -333,7 +333,7 @@
List<Long> hasIds = hasRecieveList.stream().map(MallVipBenefitsRecord::getReceiveId).collect(Collectors.toList());
List<MallVipBenefits> collect1 = benefits.stream().peek(item -> {
- List<MallVipBenefitsDetails> collect = item.getDetails().stream().filter(detail -> hasIds.contains(Long.parseLong(detail.getContent()))).collect(Collectors.toList());
+ List<MallVipBenefitsDetails> collect = item.getDetails().stream().filter(detail -> (detail.getLinkType() == 2 || detail.getLinkType() == 3) && !hasIds.contains(Long.parseLong(detail.getContent()))).collect(Collectors.toList());
item.setDetails(collect);
}).filter(item -> CollUtil.isNotEmpty(item.getDetails())).collect(Collectors.toList());
--
Gitblit v1.9.1