From 1fd3aa44578e01513fb88e10aab67bf5fb32b888 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 08 Apr 2024 16:17:07 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/vip/service/impl/MallVipBenefitsServiceImpl.java | 2 +-
src/main/resources/mapper/modules/MallVipConfigMapper.xml | 2 ++
2 files changed, 3 insertions(+), 1 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 2b33462..60447a8 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
@@ -309,7 +309,7 @@
MallVipConfig configList = mallVipConfigMapper.selectVipConfigByCode(member.getLevel());
- List<MallVipBenefits> benefits = configList.getBenefits().stream().filter(item -> item.getGainType() == 2 && item.getType() != 2).collect(Collectors.toList());
+ List<MallVipBenefits> benefits = configList.getBenefits().stream().filter(item -> item.getGainType() == 2 && item.getType() != 1).collect(Collectors.toList());
if (CollUtil.isEmpty(benefits)) {
return new HashMap<>();
}
diff --git a/src/main/resources/mapper/modules/MallVipConfigMapper.xml b/src/main/resources/mapper/modules/MallVipConfigMapper.xml
index 111b17c..6d9609d 100644
--- a/src/main/resources/mapper/modules/MallVipConfigMapper.xml
+++ b/src/main/resources/mapper/modules/MallVipConfigMapper.xml
@@ -22,6 +22,7 @@
<result property="scoreMultiple" column="score_multiple" />
<result property="gainType" column="gain_type" />
<result property="isShow" column="is_show" />
+ <result property="type" column="c_type" />
<collection property="details" ofType="cc.mrbird.febs.vip.entity.MallVipBenefitsDetails">
<id property="id" column="d_id" />
@@ -56,6 +57,7 @@
,benefits.icon c_icon
,benefits.score_multiple
,benefits.gain_type
+ ,benefits.type c_type
from mall_vip_config config
inner join mall_vip_config_benefits configBenefits on config.id=configBenefits.config_id
inner join mall_vip_benefits benefits on configBenefits.benefits_id=benefits.id
--
Gitblit v1.9.1