From 700e52d5ef6e52b4292724165adfa60e24d76838 Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Mon, 23 Dec 2024 14:52:06 +0800 Subject: [PATCH] fix(mall): 修复兑换余额时碳积分不足的问题 --- src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java index 322edc0..1d9552c 100644 --- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java @@ -495,7 +495,7 @@ * 用户的等级level是否允许兑换碳币 */ RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel())); - if(ObjectUtil.isEmpty(runVip) || runVip.getWithdrawState() != YesOrNoEnum.YES.getValue()){ + if(ObjectUtil.isEmpty(runVip) || runVip.getInsideState() != YesOrNoEnum.YES.getValue()){ throw new FebsException("请先升级会员"); } @@ -640,6 +640,11 @@ RunVip runVip = runVipMapper.selectOne(new LambdaQueryWrapper<RunVip>().eq(RunVip::getVipCode, loginMember.getLevel())); if(ObjectUtil.isEmpty(runVip) || runVip.getChangeState() != YesOrNoEnum.YES.getValue()){ throw new FebsException("请先升级会员"); + } + + MallMemberWallet mallMemberWallet = mallMemberWalletMapper.selectWalletByMemberId(memberId); + if(minScore.compareTo(mallMemberWallet.getScore()) > 0){ + throw new FebsException("碳积分不足"); } BigDecimal scoreBalancePercent = new BigDecimal( @@ -1555,6 +1560,10 @@ public static String hidePhoneNumber(String phoneNumber) { + //判断字符串的长度小于4就直接返回 + if (phoneNumber.length() < 4) { + return phoneNumber; + } // 获取前3位和后4位 String prefix = phoneNumber.substring(0, 3); // 生成隐藏的电话号码 -- Gitblit v1.9.1