From babb182e69f9c7e470bbad9378fb418af22dbb9d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 20 Oct 2022 16:48:54 +0800
Subject: [PATCH] 20221020

---
 src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
index 6df59ff..89677d0 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappMemberServiceImpl.java
@@ -600,13 +600,27 @@
         DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
         if(ObjectUtil.isEmpty(dappMemberEntity)){
             memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
+            memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+            memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
         }else{
             BigDecimal totalAmount = dappWalletCoinEntity.getTotalAmount();
+            BigDecimal frozenAmount = dappWalletCoinEntity.getFrozenAmount();
+            BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
             if(BigDecimal.ZERO.compareTo(totalAmount) > 0){
                 memberInfoVo.setTotalAmount(AppContants.INIT_MONEY);
             }else{
                 memberInfoVo.setTotalAmount(totalAmount.setScale(2,BigDecimal.ROUND_DOWN));
             }
+            if(BigDecimal.ZERO.compareTo(frozenAmount) > 0){
+                memberInfoVo.setFrozenAmount(AppContants.INIT_MONEY);
+            }else{
+                memberInfoVo.setFrozenAmount(frozenAmount.setScale(2,BigDecimal.ROUND_DOWN));
+            }
+            if(BigDecimal.ZERO.compareTo(availableAmount) > 0){
+                memberInfoVo.setAvailableAmount(AppContants.INIT_MONEY);
+            }else{
+                memberInfoVo.setAvailableAmount(availableAmount.setScale(2,BigDecimal.ROUND_DOWN));
+            }
         }
         return memberInfoVo;
     }

--
Gitblit v1.9.1