From 68a3672999b666ca83dedf190849ac3c610b01e3 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 23 Feb 2024 11:41:04 +0800
Subject: [PATCH] 抽奖

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 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 6e67ab2..6506e51 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
@@ -382,8 +382,10 @@
 
         MyTeamVo myTeamVo = new MyTeamVo();
         myTeamVo.setTeam(list);
-        myTeamVo.setMyAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1));
-        myTeamVo.setMyTeamAchieve(this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2));
+        BigDecimal myAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 1);
+        myTeamVo.setMyAchieve(myAchieve);
+        BigDecimal myTeamAchieve = this.baseMapper.selectAchieveByMemberId(mallMember.getInviteId(), 2);
+        myTeamVo.setMyTeamAchieve(myTeamAchieve.add(myAchieve));
         myTeamVo.setMyTeamCnt(this.baseMapper.selectAllChildAgentListByInviteId(mallMember.getInviteId()).size());
         return new FebsResponse().success().data(myTeamVo);
     }
@@ -889,7 +891,7 @@
         MallMemberAmount mallMemberAmount = mallMemberAmountMapper.selectByMemberId(memberId);
         BigDecimal fcmCntAva = mallMemberAmount.getTokenAva();
         if(memberFrozenFcmCnt.compareTo(fcmCntAva) > 0){
-            throw new FebsException("解除冻结需要宝石的数量为:" + fcmCntAva);
+            throw new FebsException("激活需要宝石的数量为:" + fcmCntAva);
         }
         if(2 == unfreezeDto.getType()){
             List<MallMember> mallMembers = this.baseMapper.selectByRefererId(loginMember.getInviteId());

--
Gitblit v1.9.1