From f16f74cacb9ef0ae4be89ed15353b6a449479d8c Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 28 May 2025 13:38:09 +0800
Subject: [PATCH] feat(mall): 添加轮播图背景图片功能

---
 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java |    6 ++++--
 1 files changed, 4 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..e82887b 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
@@ -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());
 

--
Gitblit v1.9.1