fix

Helius

2024-04-09 ada43ef489d1e275059ce1de79808e51e734cc11

fix

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