From 6352a0f7e96accea66900f7478f59300a49de7d8 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 27 Jun 2025 16:56:39 +0800
Subject: [PATCH] 回调
---
src/main/java/project/web/api/UserWalletAddressController.java | 92 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 77 insertions(+), 15 deletions(-)
diff --git a/src/main/java/project/web/api/UserWalletAddressController.java b/src/main/java/project/web/api/UserWalletAddressController.java
index c5e2b26..210ba00 100644
--- a/src/main/java/project/web/api/UserWalletAddressController.java
+++ b/src/main/java/project/web/api/UserWalletAddressController.java
@@ -11,8 +11,10 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpStatus;
import cn.hutool.json.JSONUtil;
+import kernel.cache.RedisLocalCache;
import kernel.exception.BusinessException;
import kernel.util.StringUtils;
+import kernel.web.BaseAction;
import kernel.web.Page;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -25,6 +27,8 @@
import io.netty.util.internal.StringUtil;
import kernel.web.ResultObject;
import project.blockchain.AdminChannelBlockchainService;
+import project.blockchain.RechargeBlockchainService;
+import project.party.PartyRedisKeys;
import project.user.UserWalletAddress;
import project.user.UserWalletAddressService;
@@ -37,7 +41,7 @@
@RestController
@CrossOrigin
-public class UserWalletAddressController {
+public class UserWalletAddressController extends BaseAction {
@Autowired
UserWalletAddressService userWalletAddressService;
@@ -49,10 +53,19 @@
@Autowired
private AdminChannelBlockchainService adminChannelBlockchainService;
+ @Autowired
+ private RechargeBlockchainService rechargeBlockchainService;
+
+ /**
+ * 本地Redis工具(先取本地缓存再取Redis缓存)
+ */
+ @Autowired
+ private RedisLocalCache redisLocalCache;
+
private final String gateway = "https://sig11.udun.io";
private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c";
private final String merchantId = "319563";
- private final String defaultCallBackUrl = "https://coin.usadeepcoin.com/admin/normal/adminRechargeBlockchainOrderAction!rechargeCallback.action";
+ private final String defaultCallBackUrl = "https://coin.usadeepcoin.com/wap/api/user!rechargeCallback.action";
@@ -102,8 +115,9 @@
int pageSize=300;
try {
pageNo=checkAndSetPageNo(pageNoStr);
+ String partyId = this.getLoginPartyId();
page = this.adminChannelBlockchainService.pagedQuery(pageNo, pageSize, name_para, coin_para);
- Map<String, List<Map<String, Object>>> coinMap = getStringListMap();
+ 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);
@@ -132,7 +146,7 @@
}
@NotNull
- private Map<String, List<Map<String, Object>>> getStringListMap() {
+ private Map<String, List<Map<String, Object>>> getStringListMap(String partyId ) {
Map<String, List<Map<String, Object>>> coinMap = new HashMap<>();
//获取商户支持币种
@@ -140,31 +154,56 @@
//创建地址
coinList.forEach(f->{
if(f.getName().equals("BTC")){
- Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ String partyBTC = (String)redisLocalCache.get(partyId + "_BTC");
+ Address address3 = new Address();
List<Map<String, Object>> btcData = new ArrayList<>();
+ if(!StringUtils.isNotEmpty(partyBTC)){
+ address3 = createAddress(f.getMainCoinType(),null,null,null);
+ btcData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"BTC"));
+ redisLocalCache.put(partyId+ "_BTC",address3.getAddress());
+ }else{
+ btcData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", partyBTC,"BTC"));
+ }
logger.info("--------------address3---------------"+address3.getAddress());
- btcData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"BTC"));
coinMap.put("btc", btcData);
logger.info("--------------BTC---------------"+coinMap.toString());
}else if(f.getName().equals("ETH")){
- Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ String partyETH = (String)redisLocalCache.get(partyId + "_ETH");
List<Map<String, Object>> ethData = new ArrayList<>();
- logger.info("--------------address3---------------"+address3.getAddress());
- ethData.add(createElement("2c948a8280828d5f018084ff569b0002", "btc", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"BTC"));
+ if(!StringUtils.isNotEmpty(partyETH)){
+ Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ logger.info("--------------address3---------------"+address3.getAddress());
+ ethData.add(createElement("2c948a8280828d5f018084ff569b0002", "eth", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", address3.getAddress(),"ETH"));
+ redisLocalCache.put(partyId + "_ETH",address3.getAddress());
+ }else{
+ ethData.add(createElement("2c948a8280828d5f018084ff569b0002", "eth", "/qr/1be19b34fbb9406c8044c1a9b08a87ca.png", partyETH,"ETH"));
+ }
coinMap.put("eth", ethData);
logger.info("--------------ETH---------------"+coinMap.toString());
}else if(f.getName().equals("USDC")){
- Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ String partyUSDC = (String)redisLocalCache.get(partyId + "_USDC");
List<Map<String, Object>> usdcData = new ArrayList<>();
- logger.info("--------------address3---------------"+address3.getAddress());
- usdcData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdt", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png", address3.getAddress(),"TRC20"));
+ if(!StringUtils.isNotEmpty(partyUSDC)){
+ Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ logger.info("--------------address3---------------"+address3.getAddress());
+ usdcData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png", address3.getAddress(),"ERC20"));
+ redisLocalCache.put(partyId + "_ETH",address3.getAddress());
+ }else{
+ usdcData.add(createElement("2c948a8280828d5f01808504eacd0004", "usdc", "/qr/975f4666ed044efa9f0ee2fa81fa8f4a.png", partyUSDC,"ERC20"));
+ }
coinMap.put("usdc", usdcData);
logger.info("--------------USDC---------------"+coinMap.toString());
}else if(f.getName().equals("USDT-ERC20")){
- Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ String partyUSDT = (String)redisLocalCache.get(partyId + "_USDT-ERC20");
List<Map<String, Object>> usdtData = new ArrayList<>();
- logger.info("--------------address3---------------"+address3.getAddress());
- usdtData.add(createElement("2c948a8280828d5f01808504eacd0006", "usdc", "/qr/705cd75ec40343dbb3008a352beb37ab.png", address3.getAddress(),"ERC20"));
+ if(!StringUtils.isNotEmpty(partyUSDT)){
+ Address address3 = createAddress(f.getMainCoinType(),null,null,null);
+ logger.info("--------------address3---------------"+address3.getAddress());
+ usdtData.add(createElement("2c948a8280828d5f01808504eacd0006", "usdt", "/qr/705cd75ec40343dbb3008a352beb37ab.png", address3.getAddress(),"ERC20"));
+ redisLocalCache.put(partyId + "_USDT-ERC20",address3.getAddress());
+ }else{
+ usdtData.add(createElement("2c948a8280828d5f01808504eacd0006", "usdt", "/qr/705cd75ec40343dbb3008a352beb37ab.png", partyUSDT,"ERC20"));
+ }
coinMap.put("usdt", usdtData);
logger.info("--------------USDT-ERC20---------------"+coinMap.toString());
}
@@ -259,4 +298,27 @@
}
}
+ @RequestMapping(action +"rechargeCallback.action")
+ public ResultMsg rechargeCallback(HttpServletRequest request){
+ String timestamp = request.getParameter("timestamp");
+ String nonce = request.getParameter("nonce");
+ String sign = request.getParameter("sign");
+ String body = request.getParameter("body");
+ logger.info("回调请求参数body{}:",body);
+ logger.info("回调请求参数sign{}:",sign);
+ try{
+ rechargeBlockchainService.callback(timestamp,nonce,sign,body);
+ logger.info("回调成功");
+ ResultMsg resultMsg = new ResultMsg();
+ resultMsg.setCode(200);
+ return resultMsg;
+ }catch (Exception e){
+ logger.info("回调异常",e);
+ ResultMsg resultMsg = new ResultMsg();
+ resultMsg.setCode(500);
+ resultMsg.setMessage("回调处理失败");
+ return resultMsg;
+ }
+ }
+
}
--
Gitblit v1.9.3