From c921eff63956fb7d900d1506c361016bc4c27114 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 23 Feb 2024 22:24:00 +0800
Subject: [PATCH] Merge branch 'blnka-vip' into blnka
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java | 9 ++++++---
src/test/java/cc/mrbird/febs/PayTest.java | 9 +++++++++
2 files changed, 15 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;
}
diff --git a/src/test/java/cc/mrbird/febs/PayTest.java b/src/test/java/cc/mrbird/febs/PayTest.java
index 7dd1ad9..0ed41da 100644
--- a/src/test/java/cc/mrbird/febs/PayTest.java
+++ b/src/test/java/cc/mrbird/febs/PayTest.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.pay.util.WechatConfigure;
+import cc.mrbird.febs.vip.service.IMallVipConfigService;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
@@ -59,4 +60,12 @@
redisUtils.set(accessTokenKey,accessToken);
}
}
+
+ @Autowired
+ private IMallVipConfigService mallVipConfigService;
+
+ @Test
+ public void test() {
+ mallVipConfigService.findConfigList();
+ }
}
--
Gitblit v1.9.1