From 0bbcc99c76e9fc4e20e9af66776bb8eaa0ca1984 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:22 +0800
Subject: [PATCH] Merge branch 'blnka-vip' of http://120.27.238.55:7000/r/xc-mall into blnka-vip
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 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 6ff9a0c..03b7aa1 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,11 +49,13 @@
public List<MallVipConfig> findConfigList() {
List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
configs.forEach(item -> {
- item.getBenefits().stream().filter(benefit -> {
+ List<MallVipBenefits> data = item.getBenefits().stream().filter(benefit -> {
return benefit.getIsShow() == 1;
- }).forEach(benefits -> {
+ }).peek(benefits -> {
benefits.setIsJump(CollUtil.isEmpty(benefits.getDetails()) ? 2 : 1);
- });
+ }).collect(Collectors.toList());
+
+ item.setBenefits(data);
});
return configs;
}
--
Gitblit v1.9.1