From 3e39512dfde0035f556f177dac58052baf686853 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 30 Jan 2024 15:38:42 +0800
Subject: [PATCH] 一代5%是他入金额的5% 团队5%是团队收益的5%
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 2b06dfb..0f0df8e 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
@@ -287,6 +287,7 @@
mallMemberVo.setLevelName(dic.getDescription());
}
MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(mallMember.getId());
+ mallMemberVo.setGsd(mallMemberAmount.getGsd());
mallMemberVo.setStaticNft(mallMemberAmount.getStaticNft());
mallMemberVo.setTrendsNft(mallMemberAmount.getTrendsNft());
mallMemberVo.setFrozenNft(mallMemberAmount.getFrozenNft());
@@ -859,6 +860,7 @@
@Override
public FebsResponse unfreeze(UnfreezeDto unfreezeDto) {
Long memberId = LoginUserUtil.getLoginUser().getId();
+ MallMember loginMember = this.baseMapper.selectById(memberId);
/**
* 判断账号是否冻结
* 判断账号FCM代币是否足够
@@ -878,13 +880,13 @@
DataDictionaryEnum.MEMBER_FROZEN_FCM_CNT.getCode()
);
BigDecimal memberFrozenFcmCnt = new BigDecimal(memberFrozenFcmCntDic.getValue());
- MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(unfreezeMemberId);
+ MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
BigDecimal fcmCntAva = mallMemberAmount.getFcmCntAva();
if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
- throw new FebsException("解除冻结需要FCM的数量为：" + fcmCntAva);
+ throw new FebsException("解除冻结需要GFA的数量为：" + fcmCntAva);
}
if(2 == unfreezeDto.getType()){
- List<MallMember> mallMembers = this.baseMapper.selectByRefererId(mallMember.getInviteId());
+ List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());
List<Long> collectMemberIds = mallMembers.stream().map(MallMember::getId).collect(Collectors.toList());
if(!collectMemberIds.contains(unfreezeMemberId)){
throw new FebsException("直接推荐人才能解除账户的冻结状态");
@@ -897,7 +899,7 @@
this.baseMapper.updateById(mallMember);
mallMoneyFlowService.addMoneyFlow(
- mallMember.getId(),
+ memberId,
memberFrozenFcmCnt.negate(),
MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
MallUtils.getOrderNum(),
--
Gitblit v1.9.1