From 7d42d545ce1c5a7acb01d7571ce4f3a6fe0162e1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 03 Sep 2024 15:25:46 +0800
Subject: [PATCH] 1

---
 src/main/java/com/nq/service/impl/UserServiceImpl.java |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nq/service/impl/UserServiceImpl.java b/src/main/java/com/nq/service/impl/UserServiceImpl.java
index f9ba983..f35eced 100644
--- a/src/main/java/com/nq/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserServiceImpl.java
@@ -746,10 +746,24 @@
         List<User> users = this.userMapper.listByAgent(realName, phone, searchId, accountType);
 
         List<AgentUserListVO> agentUserListVOS = Lists.newArrayList();
+
         for (User user : users) {
+
+            ServerResponse money = iUserService.getMoney(user.getId());
+            List<RUserAssets> rUserAssetsList = (List<RUserAssets>) money.getData();
+            RUserAssets rUserAssets = rUserAssetsList.stream()
+                    .filter(stock -> "IN".equals(stock.getAccectType()))
+                    .findFirst()
+                    .orElse(null);
+
             AgentUserListVO agentUserListVO = assembleAgentUserListVO(user, siteSetting
                     .getForceStopPercent(), siteIndexSetting
                     .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);
         }
 
@@ -1053,7 +1067,9 @@
         agentUserListVO.setIsLogin(user.getIsLogin());
         agentUserListVO.setRegAddress(user.getRegAddress());
         agentUserListVO.setIsActive(user.getIsActive());
-
+        agentUserListVO.setImg1Key(user.getImg1Key());
+        agentUserListVO.setImg2Key(user.getImg2Key());
+        agentUserListVO.setImg3Key(user.getImg3Key());
 
 
 

--
Gitblit v1.9.3