From 178a6d1916c09f1068a92bf86968d349c89359ce Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 26 Feb 2024 10:39:18 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipConfigServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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 c1a15ae..6ff9a0c 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
@@ -46,7 +46,15 @@
@Override
public List<MallVipConfig> findConfigList() {
- return this.baseMapper.selectVipConfigList();
+ List<MallVipConfig> configs = this.baseMapper.selectVipConfigList();
+ configs.forEach(item -> {
+ item.getBenefits().stream().filter(benefit -> {
+ return benefit.getIsShow() == 1;
+ }).forEach(benefits -> {
+ benefits.setIsJump(CollUtil.isEmpty(benefits.getDetails()) ? 2 : 1);
+ });
+ });
+ return configs;
}
@Override
@@ -145,6 +153,10 @@
return false;
}
+ if (item.getGainType() == 3 && item.getScoreMultiple() != null) {
+ return true;
+ }
+
// 生日权益
if (item.getGainType() == 2 && isBirthday) {
return true;
@@ -157,6 +169,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