From dacb049fcace5768db68f956895bdabaccb757f4 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 23 Dec 2024 14:31:54 +0800
Subject: [PATCH] fix: 更新阿里云 OSS SDK脚本链接
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 447cefe..9bcb3d3 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("请先升级会员");
}
@@ -538,6 +538,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void withdrawal(WithdrawalDto withdrawalDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
MallMember loginMember = this.baseMapper.selectById(memberId);
@@ -583,6 +584,8 @@
/**
* 减少碳币，增加进行中提现记录
*/
+ walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
+
BigDecimal withdrawalAmount = withdrawalDto.getAmount().multiply(balanceToCoin).setScale(2, BigDecimal.ROUND_DOWN);
BigDecimal fee = balanceToCoinPercent.multiply(withdrawalAmount).setScale(2, BigDecimal.ROUND_DOWN);
BigDecimal withdrawalAmountReal = withdrawalAmount.subtract(fee);
@@ -595,9 +598,9 @@
withdraw.setAmountFee(fee);
withdraw.setName(mallMemberPayment.getBank());
withdraw.setType(mallMemberPayment.getBankNo());
+ withdraw.setWithdrawTimes(withdrawalDto.getAmount());
mallMemberWithdrawMapper.insert(withdraw);
- walletService.reduceBalance(withdrawalDto.getAmount(), loginMember.getId());
this.runVipMoneyFlowAdd(
loginMember.getId(),
loginMember.getId(),
@@ -612,6 +615,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void commissionChange(CommissionChangeDto commissionChange) {
Long memberId = LoginUserUtil.getLoginUser().getId();
BigDecimal minScore = new BigDecimal(
@@ -1551,6 +1555,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