From 2a9a77e021c16037220c2c29ca116a69e352bdcc Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 25 Jan 2024 10:20:25 +0800
Subject: [PATCH] 发票
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 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 694f16c..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());
@@ -384,7 +385,7 @@
@Override
public FebsResponse teamFcmList(TeamListDto teamListDto) {
Long memberId = null;
- if (teamListDto.getId() == null) {
+ if (ObjectUtil.isEmpty(teamListDto.getId())) {
memberId = LoginUserUtil.getLoginUser().getId();
} else {
memberId = teamListDto.getId();
@@ -411,9 +412,9 @@
if(CollUtil.isNotEmpty(mallMembersDirects)){
for(MallMember mallMembersDirect : mallMembersDirects){
MyFcmTeamVo myTeamDirectVo = new MyFcmTeamVo();
- myTeamVo.setMemberId(mallMembersDirect.getId());
- myTeamVo.setAccountLogin(mallMembersDirect.getAccountLogin());
- myTeamVo.setIsFrozen(mallMembersDirect.getIsFrozen());
+ myTeamDirectVo.setMemberId(mallMembersDirect.getId());
+ myTeamDirectVo.setAccountLogin(mallMembersDirect.getAccountLogin());
+ myTeamDirectVo.setIsFrozen(mallMembersDirect.getIsFrozen());
myTeamDirectVo.setLevelName(MemberLevelNewEnum.ZERO_LEVEL.getLevelName(mallMembersDirect.getLevel()));
myTeamDirectVo.setMyAchieveBuy(this.baseMapper.selectAchieveBuyByMemberId(mallMembersDirect.getInviteId(), 1));
myTeamDirectVo.setMyAchieveSell(this.baseMapper.selectAchieveSellByMemberId(mallMembersDirect.getInviteId(), 1));
@@ -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