blame | history | patch | commit | commitdiff | ignore whitespace
Administrator
2025-05-28 f16f74cacb9ef0ae4be89ed15353b6a449479d8c 
 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java


@@ -276,6 +276,7 @@


            mallMemberCouponMapper.insert(memberCoupon);




            record.setReceiveName(coupon.getName());


            record.setStatus(1);


        }




        mallVipBenefitsRecordMapper.insert(record);


@@ -320,7 +321,8 @@


        });




        LambdaQueryWrapper<MallVipBenefitsRecord> recordQuery = new LambdaQueryWrapper<>();


        recordQuery.eq(MallVipBenefitsRecord::getReceiveId, ids)


        recordQuery.in(MallVipBenefitsRecord::getReceiveId, ids)


                .eq(MallVipBenefitsRecord::getMemberId, member.getId())


                .ge(MallVipBenefitsRecord::getReceiveTime, DateUtil.beginOfDay(new Date()))


                .le(MallVipBenefitsRecord::getReceiveTime, DateUtil.endOfDay(new Date()));


        List<MallVipBenefitsRecord> hasRecieveList = mallVipBenefitsRecordMapper.selectList(recordQuery);


@@ -333,7 +335,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());