From d78a33a6707fdd67069e6b1ff09493f3dc83e863 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 02 Sep 2024 18:26:12 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/vo/agent/AgentUserListVO.java     |    9 +++++++++
 src/main/java/com/nq/service/impl/UserServiceImpl.java |    2 ++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index a85aff3..f35eced 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -761,6 +761,8 @@
                     .getForceSellPercent(), siteFuturesSetting.getForceSellPercent());
             if (rUserAssets != null) {
                 agentUserListVO.setUserAmt(rUserAssets.getTotalMoney().equals("0E-8") ? new BigDecimal("0") : new BigDecimal(rUserAssets.getTotalMoney()));
+                agentUserListVO.setFreezeMoney(rUserAssets.getFreezeMoney().equals("0E-8") ? "0" : rUserAssets.getFreezeMoney());
+                agentUserListVO.setAvailableBalance(rUserAssets.getAvailableBalance().equals("0E-8") ? "0" : rUserAssets.getAvailableBalance());
             }
             agentUserListVOS.add(agentUserListVO);
         }
diff --git a/src/main/java/com/nq/vo/agent/AgentUserListVO.java b/src/main/java/com/nq/vo/agent/AgentUserListVO.java
index fe228c6..7bfa03a 100644
--- a/src/main/java/com/nq/vo/agent/AgentUserListVO.java
+++ b/src/main/java/com/nq/vo/agent/AgentUserListVO.java
@@ -55,6 +55,15 @@
     private BigDecimal futuresForceLine;
     private BigDecimal allFuturesFreezAmt;
     private BigDecimal allFuturesProfitAndLose;
+    /**
+     *  总可用余额
+     * */
+    private String availableBalance;
+
+    /**
+     *  总冻结资产
+     * */
+    private String freezeMoney;
 
     public void setAgentId(Integer agentId) {
         this.agentId = agentId;

--
Gitblit v1.9.3