From 575411c3f1abc10184ee2c1b416241246f943226 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Fri, 03 Jan 2025 10:35:58 +0800 Subject: [PATCH] refactor(mall): 修改购买 VIP 接口名称 --- src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java index a939650..2aea39f 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java @@ -4,10 +4,7 @@ import cc.mrbird.febs.common.enumerates.RunVipDataDictionaryEnum; import cc.mrbird.febs.common.enumerates.YesOrNoEnum; import cc.mrbird.febs.mall.dto.ApiMemberChargeFailDto; -import cc.mrbird.febs.mall.entity.AgentInfo; -import cc.mrbird.febs.mall.entity.DataDictionaryCustom; -import cc.mrbird.febs.mall.entity.MallCharge; -import cc.mrbird.febs.mall.entity.MallMember; +import cc.mrbird.febs.mall.entity.*; import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper; import cc.mrbird.febs.mall.mapper.MallChargeMapper; import cc.mrbird.febs.mall.mapper.MallMemberMapper; @@ -28,7 +25,9 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; +import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -211,7 +210,8 @@ // 获取会员信息 MallMember mallMember = mallMemberMapper.selectById(memberId); if (mallMember == null) { - throw new IllegalArgumentException("会员不存在"); + log.info("会员不存在"); + return; } // 已经是节点则跳过 @@ -219,6 +219,17 @@ return; } + //节点不是最高等级不升级节点 + Optional<RunVip> max = runVipMapper.selectList(null).stream().max(Comparator.comparing(RunVip::getOrderNumber)); + RunVip maxRunVip = max.orElse(null); + if (maxRunVip == null) { + log.info("会员等级不存在"); + return; + } + if (!maxRunVip.getVipCode().equals(mallMember.getLevel())) { + return; + } + // 获取直推成员和团队成员 List<MallMember> allMembers = mallMemberMapper.selectList( new LambdaQueryWrapper<MallMember>() -- Gitblit v1.9.1