From 491372c3bffec87342f9f7f5546e2e83d5645d67 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Sun, 04 Feb 2024 18:09:06 +0800
Subject: [PATCH] 确认收货更新用户的会员信息

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    9 +++++----
 1 files changed, 5 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 0c98112..16cafbd 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());
@@ -528,7 +529,7 @@
         }
         if(2 == type){
             if (amount.compareTo(mallMemberAmountLogin.getTokenAva()) > 0) {
-                throw new FebsException("门票不足");
+                throw new FebsException("宝石不足");
             }
             mallMemberAmountLogin.setTokenAva(mallMemberAmountLogin.getTokenAva().subtract(amount));
             mallMemberAmountMapper.updateTokenAvaById(mallMemberAmountLogin);
@@ -879,10 +880,10 @@
                 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(loginMember.getInviteId());
@@ -898,7 +899,7 @@
         this.baseMapper.updateById(mallMember);
 
         mallMoneyFlowService.addMoneyFlow(
-                mallMember.getId(),
+                memberId,
                 memberFrozenFcmCnt.negate(),
                 MoneyFlowTypeNewEnum.UNFREEZE_USER.getValue(),
                 MallUtils.getOrderNum(),

--
Gitblit v1.9.1