From 75d8b0ad39a7eb04f72ef8654dbb895322f07cfd Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 21 Oct 2025 13:41:42 +0800
Subject: [PATCH] feat(ai): 新增会员答题分页及详情查询功能 - 在 AiMemberAnswerMapper 中新增 getAnswerPage 方法及对应 XML 查询语句 - 新增 ApiMemberAnswerPageDto 和 ApiMemberAnswerPageVo 用于分页查询参数和返回结果 - 在 AiMemberAnswerService 及其实现类中添加 getAnswerPage 方法 - 在 AiMemberService 及其实现类中新增 answerPage 和 answerInfo 接口实现 - 新增 ApiMemberAnswerInfoDto 和 ApiMemberAnswerInfoVo 用于答题详情接口参数和响应 - 在 ApiMemberController 中增加 /answerPage 和 /answerInfo两个 POST 接口 - 优化 AiMemberTeamPracticeVo,增加 memberUuid 字段 - 统一导入包路径,简化代码结构

---
 src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
index 3f3b1fe..224fd19 100644
--- a/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java
@@ -28,6 +28,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -48,9 +49,13 @@
     public List<MallVipConfig> findConfigList() {
         List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
         configs.forEach(item -> {
-            item.getBenefits().forEach(benefits -> {
+            List<MallVipBenefits> data = item.getBenefits().stream().filter(benefit -> {
+                return benefit.getIsShow() == 1;
+            }).peek(benefits -> {
                 benefits.setIsJump(CollUtil.isEmpty(benefits.getDetails()) ? 2 : 1);
-            });
+            }).collect(Collectors.toList());
+
+            item.setBenefits(data);
         });
         return configs;
     }
@@ -144,11 +149,20 @@
         }
 
         String today = DateUtil.format(new Date(), DatePattern.NORM_DATE_PATTERN);
-        boolean isBirthday = member.getBirthday().compareTo(DateUtil.parseDate(today)) == 0;
+        boolean isBirthday;
+        if (member.getBirthday() != null) {
+             isBirthday = member.getBirthday().compareTo(DateUtil.parseDate(today)) == 0;
+        } else {
+            isBirthday = false;
+        }
         List<MallVipBenefits> benefits = vipConfig.getBenefits();
         Optional<MallVipBenefits> max = benefits.stream().filter(item -> {
             if (item.getScoreMultiple() == null) {
                 return false;
+            }
+
+            if (item.getGainType() == 3 && item.getScoreMultiple() != null) {
+                return true;
             }
 
             // 生日权益
@@ -163,6 +177,6 @@
             return item.getGainType() == 1 && StrUtil.equals(data.getValue(), todayTime);
         }).max(Comparator.comparing(MallVipBenefits::getScoreMultiple));
 
-        return max.orElseGet(max::get);
+        return max.orElse(null);
     }
 }

--
Gitblit v1.9.1