From 5a8a43d5edb7af016b76246d9e9f661f4363342e Mon Sep 17 00:00:00 2001
From: jack <zengjieli93@163.com>
Date: Thu, 18 Apr 2024 11:13:24 +0800
Subject: [PATCH] 修改自选BUG  汇率

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

diff --git a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
index 850dc93..508966a 100644
--- a/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
+++ b/src/main/java/com/nq/service/impl/UserRechargeServiceImpl.java
@@ -2,6 +2,7 @@
 
 
 import com.nq.dao.*;
+import com.nq.enums.EStockType;
 import com.nq.enums.EUserAssets;
 import com.nq.pojo.*;
 import com.nq.service.*;
@@ -58,6 +59,8 @@
     @Autowired
     ISiteInfoService iSiteInfoService;
 
+    @Resource
+    UserAssetsMapper userAssetsMapper;
     public ServerResponse checkInMoney(int maxOrder, Integer userId) {
         int count = this.userRechargeMapper.checkInMoney(0, userId);
 
@@ -215,8 +218,14 @@
 
         User user = this.iUserService.getCurrentUser(request);
         List<UserRecharge> userRecharges = this.userRechargeMapper.findUserChargeList(user.getId(), payChannel, orderStatus);
-        log.info("充值列表,增加用户 {} ,payChannel = {} , orderStatus = {}, 数量 = {}", new Object[]{user.getId(), payChannel, orderStatus, userRecharges.size()});
         PageInfo pageInfo = new PageInfo(userRecharges);
+
+        for (int i = 0; i <userRecharges.size() ; i++) {
+          SitePay s =   sitePayMapper.selectById(userRecharges.get(i).getPayId());
+
+            userRecharges.get(i).setAssetsType(EStockType.getEStockTypeByCode(s.getAssetsType()).getSymbol1());
+            userRecharges.get(i).setChannelName(EStockType.getEStockTypeByCode(s.getAssetsType()).getSymbol());
+        }
 
         return ServerResponse.createBySuccess(pageInfo);
     }
@@ -266,6 +275,14 @@
 
 
         List<UserRecharge> userRecharges = this.userRechargeMapper.listByAdmin(agentId, userId, realName, state, begin_time, end_time);
+        for (int i = 0; i < userRecharges.size(); i++) {
+            UserRecharge u =userRecharges.get(i);
+            User user =  userMapper.selectById(u.getUserId());
+            if(user != null){
+                u.setUserPhone(user.getPhone());
+            }
+
+        }
         PageInfo pageInfo = new PageInfo(userRecharges);
 
         return ServerResponse.createBySuccess(pageInfo);

--
Gitblit v1.9.3