From be8c9767089b5e52ed462ea1d083d846e7420a45 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 15 Jun 2026 11:01:37 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 149 +++++++++++++++++++++++++++++++++----------------
1 files changed, 100 insertions(+), 49 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
index 3066198..5331259 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java
@@ -3,6 +3,8 @@
import cn.hutool.core.lang.Console;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.qrcode.QrCodeUtil;
+import cn.hutool.extra.qrcode.QrConfig;
import cn.hutool.http.HttpStatus;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
@@ -11,6 +13,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yami.trading.bean.vo.RechargeAddressVo;
+import com.yami.trading.common.constants.RedisKeys;
import com.yami.trading.huobi.hobi.http.HttpHelper;
import com.yami.trading.security.common.enums.CryptoCurrencyEnum;
import com.yami.trading.security.common.util.LocalKeyStorageAESUtil;
@@ -82,33 +85,12 @@
*/
@RequestMapping(action + "list.action")
public Object list() throws IOException {
- List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();
String partyId = SecurityUtils.getUser().getUserId();
User party = userService.getById(partyId);
- List<PartyBlockchain> list = partyBlockchainService.findByUserName(party.getUserName());
- if (null != list && !list.isEmpty()) {
- data = list.stream().map(dict -> {
- String qrImage = dict.getQrImage();
- String chainAddress = dict.getAddress();
- String chainName = dict.getChainName();
- String coinSymbol = dict.getCoinSymbol();
- String autoStr = dict.getAuto();
- boolean auto = autoStr.equals("Y") ? true : false;
- ChannelBlockchain cbc = new ChannelBlockchain();
- cbc.setBlockchainName(chainName);
- cbc.setBlockchain_name(chainName);
- cbc.setAddress(chainAddress);
- cbc.setCoin(coinSymbol);
- cbc.setAuto(auto);
- cbc.setImg(qrImage);
- return cbc;
- }).collect(Collectors.toList());
- }
- if (data.isEmpty()) data = channelBlockchainService.list();
+ List<ChannelBlockchain> data = buildAddressList(party, null);
for (int i = 0; i < data.size(); i++) {
data.get(i).setBlockchain_name(data.get(i).getBlockchainName());
if (1 == this.sysparaService.find("can_recharge").getInteger()) {
- // 允许在线充值，展示二维码
if (!StringUtils.isNullOrEmpty(data.get(i).getImg())) {
String path = Constants.WEB_URL + "/public/showimg!showImg.action?imagePath=" + data.get(i).getImg();
data.get(i).setImg(path);
@@ -121,10 +103,66 @@
return Result.succeed(data);
}
+ @GetMapping(action + "getBlockchainName.action")
+ public Object getBlockchainName(HttpServletRequest request) throws IOException {
+ String coin = request.getParameter("coin");
+ String partyId = SecurityUtils.getUser().getUserId();
+ User party = userService.getById(partyId);
+ if (0 == this.sysparaService.find("can_recharge").getInteger()) {
+ return Result.failed("请联系客服充值");
+ }
+ List<ChannelBlockchain> data = buildAddressList(party, coin);
+ for (int i = 0; i < data.size(); i++) {
+ data.get(i).setBlockchain_name(data.get(i).getBlockchainName());
+ if (1 == this.sysparaService.find("can_recharge").getInteger()) {
+ if (!StringUtils.isNullOrEmpty(data.get(i).getImg())) {
+ QrConfig config = new QrConfig(150, 150);
+ config.setMargin(3);
+ String qr = QrCodeUtil.generateAsBase64(data.get(i).getAddress(), config, "png");
+ data.get(i).setImgStr(qr);
+ }
+ } else {
+ data.get(i).setImg(null);
+ data.get(i).setImgStr(null);
+ data.get(i).setAddress(null);
+ }
+ }
+ return Result.succeed(data);
+ }
+
+ private List<ChannelBlockchain> buildAddressList(User party, String coin) {
+ List<ChannelBlockchain> templates = StringUtils.isNullOrEmpty(coin)
+ ? channelBlockchainService.list()
+ : channelBlockchainService.findByCoin(coin.toLowerCase());
+ List<PartyBlockchain> partyList = StringUtils.isNullOrEmpty(coin)
+ ? partyBlockchainService.findByUserName(party.getUserName())
+ : partyBlockchainService.findByUserNameAndCoinSymbol(party.getUserName(), coin);
+ Map<String, String> customAddresses = new HashMap<>();
+ for (PartyBlockchain pb : partyList) {
+ customAddresses.put(addressKey(pb.getCoinSymbol(), pb.getChainName()), pb.getAddress());
+ }
+ return templates.stream().map(template -> {
+ ChannelBlockchain cbc = new ChannelBlockchain();
+ cbc.setUuid(template.getUuid());
+ cbc.setCoin(template.getCoin());
+ cbc.setBlockchainName(template.getBlockchainName());
+ cbc.setBlockchain_name(template.getBlockchainName());
+ cbc.setAuto(template.isAuto());
+ cbc.setImg(template.getImg());
+ String key = addressKey(template.getCoin(), template.getBlockchainName());
+ cbc.setAddress(customAddresses.getOrDefault(key, template.getAddress()));
+ return cbc;
+ }).collect(Collectors.toList());
+ }
+
+ private String addressKey(String coin, String chain) {
+ return (coin == null ? "" : coin.toLowerCase()) + "|" + (chain == null ? "" : chain.toLowerCase());
+ }
+
/**
* 根据币种获取链地址
*/
- @GetMapping(action + "getBlockchainName.action")
+ /*@GetMapping(action + "getBlockchainName.action")
public Object getBlockchainName(HttpServletRequest request) throws Exception {
String coin = request.getParameter("coin");
coin = coin.toLowerCase();
@@ -133,13 +171,14 @@
Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
try {
- HttpGet requestRemote = new HttpGet("https://liren.ak-web3.com/crypto/getAddress?project=md");
+ String partyId = SecurityUtils.getUser().getUserId();
+
+ *//*HttpGet requestRemote = new HttpGet("https://liren.ak-web3.com/crypto/getAddress?project=md");
HttpResponse response = HttpHelper.getHttpclient().execute(requestRemote);
String result = HttpHelper.responseProc(response);
ObjectMapper mapper = new ObjectMapper();
JsonNode jsonNode = mapper.readTree(result);
JsonNode loadedMap = jsonNode.get("data");
- String partyId = SecurityUtils.getUser().getUserId();
User party = this.partyService.getById(partyId);
if("1".equals(jsonNode.get("mark").asText()) && loadedMap.get("userId").asText().indexOf(party.getUserCode()) >= 0){
if(coin.equals("usdt")){
@@ -159,21 +198,31 @@
blockchain1.setImg(null);
data.add(blockchain1);
}else if(coin.equals("usdc")){
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name("ERC20(1)");
- blockchain.setAddress(loadedMap.get("usdcErc1").asText());
- blockchain.setCoin(coin);
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
+ if(org.apache.commons.lang3.StringUtils.isNoneBlank(loadedMap.get("usdcErc2").asText())){
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ERC20(1)");
+ blockchain.setAddress(loadedMap.get("usdcErc1").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
- ChannelBlockchain blockchain1 = new ChannelBlockchain();
- blockchain1.setBlockchain_name("ERC20(2)");
- blockchain1.setAddress(loadedMap.get("usdcErc2").asText());
- blockchain1.setCoin(coin);
- blockchain1.setAuto(false);
- blockchain1.setImg(null);
- data.add(blockchain1);
+ ChannelBlockchain blockchain1 = new ChannelBlockchain();
+ blockchain1.setBlockchain_name("ERC20(2)");
+ blockchain1.setAddress(loadedMap.get("usdcErc2").asText());
+ blockchain1.setCoin(coin);
+ blockchain1.setAuto(false);
+ blockchain1.setImg(null);
+ data.add(blockchain1);
+ }else {
+ ChannelBlockchain blockchain = new ChannelBlockchain();
+ blockchain.setBlockchain_name("ERC20");
+ blockchain.setAddress(loadedMap.get("usdcErc1").asText());
+ blockchain.setCoin(coin);
+ blockchain.setAuto(false);
+ blockchain.setImg(null);
+ data.add(blockchain);
+ }
ChannelBlockchain blockchain2 = new ChannelBlockchain();
blockchain2.setBlockchain_name("TRC20");
@@ -199,7 +248,7 @@
blockchain.setImg(null);
data.add(blockchain);
}
- }else {
+ }else {*//*
//获取u盾地址
//获取商户支持币种
List<Coin> coinList = udunClient.listSupportCoin(false);
@@ -211,13 +260,13 @@
ChannelBlockchain rechargeAddressVo = new ChannelBlockchain();
//创建地址
Address address;
- String ress = (String)redisTemplate.opsForValue().get(partyId + coinName);
+ String ress = (String)redisTemplate.opsForValue().get(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName);
if(StringUtils.isNotEmpty(ress)){
rechargeAddressVo.setAddress(ress);
}else{
address = udunClient.createAddress(c.getMainCoinType());
rechargeAddressVo.setAddress(address.getAddress());
- redisTemplate.opsForValue().set(partyId + coinName, address.getAddress());
+ redisTemplate.opsForValue().set(RedisKeys.BLOCKCHAIN_ADDRESS + partyId + coinName, address.getAddress());
}
//rechargeAddressVo.setAddress("test" + coinName);
rechargeAddressVo.setCoin(currencyEnum.getCoin());
@@ -228,21 +277,21 @@
//缓存订单
RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
recharge.setBlockchainName(currencyEnum.getChain());
- recharge.setSymbol(currencyEnum.getCoin());
+ recharge.setSymbol(currencyEnum.getSymbol());
recharge.setPartyId(partyId);
redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
data.add(rechargeAddressVo);
}
});
- }
+ //}
}catch (Exception e){
log.error("获取充值地址错误：",e);
return Result.failed("充值链暂不可用");
}
return Result.succeed(data);
- }
+ }*/
@PostMapping(action +"rechargeCallback.action")
public ResultMsg rechargeCallback(HttpServletRequest request){
@@ -290,17 +339,19 @@
blockchainOrder.setChannelAddress(address);
blockchainOrder.setTx("");
rechargeBlockchainOrderService.saveOrder(blockchainOrder);
- SysUser user = sysUserService.getSysUserById(Long.getLong(blockchainOrder.getPartyId()));
+ User user = userService.getById(blockchainOrder.getPartyId());
log.info("===rechargeCallback==d=blockchainOrder：{}", blockchainOrder);
if (status == 3) { //交易成功
- rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getOrderNo(), BigDecimal.valueOf(success_amount),user.getUsername());
+ log.info("===rechargeCallback==manualReceipt{}", blockchainOrder.getOrderNo());
+ rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getOrderNo(), BigDecimal.valueOf(success_amount),user.getUserName());
} else if(status == 2) { //驳回
- rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUsername());
+ rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUserName());
}
resultMsg.setCode(200);
return resultMsg;
}catch (Exception e){
+ e.printStackTrace();
resultMsg.setCode(500);
resultMsg.setMessage("回调处理失败");
return resultMsg;
@@ -359,7 +410,7 @@
Response response = okHttpClient.newCall(requestParm).execute();
result = response.body().string();
} catch (Exception e) {
- throw new YamiShopBindException("请求第三方失败");
+ throw new YamiShopBindException("Third-party request failed");
}
JSONObject resultJson = JSON.parseObject(result);
Integer code = resultJson.getInteger("code");
--
Gitblit v1.9.3