From f31fc9f42f78de0808e7f4bdc797c5e622df09e3 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:22:37 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 166 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 71 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 cf9391b..426b620 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
@@ -1,15 +1,21 @@
package com.yami.trading.api.controller.exchange;
+import cn.hutool.core.collection.CollectionUtil;
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;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
import com.yami.trading.api.UD.*;
@@ -34,6 +40,8 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import okhttp3.*;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpGet;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.GetMapping;
@@ -70,6 +78,15 @@
RechargeBlockchainOrderService rechargeBlockchainOrderService;
@Autowired
UdunClient udunClient;
+ @Autowired
+ protected UserService partyService;
+
+ private String normalizeChainKey(String value) {
+ if (value == null) {
+ return "";
+ }
+ return value.replace("-", "").replace("_", "").replace(" ", "").toUpperCase(Locale.ROOT);
+ }
/**
* 获取所有链地址
@@ -115,37 +132,11 @@
return Result.succeed(data);
}
- /**
- * 根据币种获取链地址
- */
- @GetMapping(action + "getBlockchainName.action")
- public Object getBlockchainName(HttpServletRequest request) throws Exception {
- /*String coin = request.getParameter("coin");
- List<ChannelBlockchain> data = new ArrayList<>();
- try {
- coin = coin.toLowerCase();
- Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
- List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
- currencyEnums.forEach(f->{
- try {
- String address = LocalKeyStorageAESUtil.loadAndDecrypt(f.getName());
- ChannelBlockchain blockchain = new ChannelBlockchain();
- blockchain.setBlockchain_name(f.getChain());
- blockchain.setAddress(address);
- blockchain.setCoin(f.getCoin());
- blockchain.setAuto(false);
- blockchain.setImg(null);
- data.add(blockchain);
- } catch (Exception e) {
- e.getMessage();
- }
- });
- }catch (Exception e){
- log.error("获取充值地址错误：",e);
- return Result.failed("充值链暂不可用");
- }
- return Result.succeed(data);*/
-
+// @GetMapping(action + "getBlockchainName.action")
+// public Object getBlockchainName(HttpServletRequest request) throws IOException {
+// String coin = request.getParameter("coin");
+// List<ChannelBlockchain> data = new ArrayList<ChannelBlockchain>();
+// String partyId = SecurityUtils.getUser().getUserId();
// User party = userService.getById(partyId);
// if (0 == this.sysparaService.find("can_recharge").getInteger()) {
// return Result.failed("请联系客服充值");
@@ -168,18 +159,17 @@
// return cbc;
// }).collect(Collectors.toList());
// }
-// return Result.succeed(data);
-
-
-// //后台设置地址
// if (data.isEmpty()) data = this.channelBlockchainService.findByCoin(coin.toLowerCase());
// 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).setImgStr("/public/showimg!showImg.action?imagePath=" + data.get(i).getImg());
-// data.get(i).setImg(path);
+// QrConfig config = new QrConfig(150, 150);
+// config.setMargin(3);
+// String qr = QrCodeUtil.generateAsBase64(data.get(i).getAddress(), config, "png");
+// data.get(i).setImgStr(qr);
+//// data.get(i).setImgStr("/public/showimg!showImg.action?imagePath=" + data.get(i).getImg());
+//// data.get(i).setImg(path);
// }
// } else {
// data.get(i).setImg(null);
@@ -187,54 +177,72 @@
// data.get(i).setAddress(null);
// }
// }
+// return Result.succeed(data);
+// }
-// String partyId =SecurityUtils.getUser().getUserId();
-// if(!StringUtils.isNotEmpty(partyId)){
-// throw new YamiShopBindException("请登录！");
-// }
-// if (0 == this.sysparaService.find("can_recharge").getInteger()) {
-// return Result.failed("请联系客服充值");
-// }
- String coin = request.getParameter("coin");
- coin = coin.toLowerCase();
- List<ChannelBlockchain> data = new ArrayList<>();
- Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
- List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
+ /**
+ * 根据币种获取链地址
+ */
+ @GetMapping(action + "getBlockchainName.action")
+ public Object getBlockchainName(HttpServletRequest request) {
try {
- String partyId = SecurityUtils.getUser().getUserId();
- //获取u盾地址
- //获取商户支持币种
- List<Coin> coinList = udunClient.listSupportCoin(false);
+ String coin = request.getParameter("coin");
+ String partyId = SecurityUtils.getUser().getUserId();
+ coin = coin.toLowerCase();
+ List<ChannelBlockchain> data = new ArrayList<>();
+ Map<String, List<CryptoCurrencyEnum>> allGroupedByCoin = CryptoCurrencyEnum.getAllGroupedByCoin();
+ List<CryptoCurrencyEnum> currencyEnums = allGroupedByCoin.get(coin);
+ List<Coin> coinList = udunClient.listSupportCoin(false);
+ if (CollectionUtil.isEmpty(currencyEnums) || CollectionUtil.isEmpty(coinList)) {
+ return Result.succeed(data);
+ }
currencyEnums.forEach((currencyEnum) -> {
String coinName = currencyEnum.getName();
- Coin c = coinList.stream().filter(x -> x.getName().equals(coinName)).findFirst().orElse(null);
+ String normalizedCoinName = normalizeChainKey(coinName);
+ Coin c = coinList.stream().filter(x ->
+ normalizedCoinName.equals(normalizeChainKey(x.getName()))
+ || normalizedCoinName.equals(normalizeChainKey(x.getCoinType()))
+ || normalizedCoinName.equals(normalizeChainKey(x.getSymbol()))
+ || (normalizeChainKey(currencyEnum.getCoin()).equals(normalizeChainKey(x.getCoinType()))
+ && normalizeChainKey(currencyEnum.getChain()).contains("BSC")
+ && (normalizeChainKey(x.getName()).contains("BSC")
+ || normalizeChainKey(x.getMainCoinType()).contains("BSC")
+ || normalizeChainKey(x.getSymbol()).contains("BSC")))
+ ).findFirst().orElse(null);
if (c != null) {
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());
rechargeAddressVo.setBlockchain_name(currencyEnum.getChain());
rechargeAddressVo.setAuto(false);
rechargeAddressVo.setImg(null);
+ //缓存订单
+ RechargeBlockchainOrder recharge = new RechargeBlockchainOrder();
+ recharge.setBlockchainName(currencyEnum.getChain());
+ recharge.setSymbol(currencyEnum.getCoin());
+ recharge.setPartyId(partyId);
+ redisTemplate.opsForValue().set(rechargeAddressVo.getAddress(), recharge);
+
data.add(rechargeAddressVo);
}
});
+ return Result.succeed(data);
+ //}
}catch (Exception e){
log.error("获取充值地址错误：",e);
- return Result.failed("充值链暂不可用");
+ return Result.failed("Failed");
}
- return Result.succeed(data);
}
@PostMapping(action +"rechargeCallback.action")
@@ -261,25 +269,41 @@
double decimals = Double.parseDouble(map.get("decimals").toString());
double success_amount = amounts / Math.pow(10, decimals);
String address = map.get("address").toString();
-
- RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
+ Integer status = Integer.valueOf(map.get("status").toString());
+ /*RechargeBlockchainOrder blockchainOrder = rechargeBlockchainOrderService.getOne(new LambdaQueryWrapper<>(RechargeBlockchainOrder.class)
.eq(RechargeBlockchainOrder::getSucceeded, 0)
.eq(RechargeBlockchainOrder::getChannelAddress, address).last(" limit 1 "));
- if(ObjectUtil.isEmpty(blockchainOrder)){
+ if(ObjectUtil.isEmpty(blockchainOrder)) {
+ resultMsg.setCode(200);
+ return resultMsg;
+ }*/
+
+ //查询地址订单
+ RechargeBlockchainOrder blockchainOrder = (RechargeBlockchainOrder)redisTemplate.opsForValue().get(address);
+ if (blockchainOrder == null){
resultMsg.setCode(200);
return resultMsg;
}
- Integer status = Integer.valueOf(map.get("status").toString());
- SysUser user = sysUserService.getSysUserById( Long.getLong(blockchainOrder.getPartyId()));
- if (status == 3) { //交易成功
- rechargeBlockchainOrderService.manualReceipt(1,blockchainOrder.getPartyId(), BigDecimal.valueOf(success_amount),user.getUsername());
- } else if(status == 2) { //驳回
- rechargeBlockchainOrderService.refusalApply(blockchainOrder.getUuid(), "订单失败：" + status, user.getUsername());
- }
+ blockchainOrder.setAddress(null);
+ blockchainOrder.setVolume(success_amount);
+ blockchainOrder.setImg(null);
+ blockchainOrder.setSucceeded(0);
+ blockchainOrder.setChannelAddress(address);
+ blockchainOrder.setTx("");
+ rechargeBlockchainOrderService.saveOrder(blockchainOrder);
+ User user = userService.getById(blockchainOrder.getPartyId());
+ log.info("===rechargeCallback==d=blockchainOrder：{}", blockchainOrder);
+ if (status == 3) { //交易成功
+ 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());
+ }
resultMsg.setCode(200);
return resultMsg;
}catch (Exception e){
+ e.printStackTrace();
resultMsg.setCode(500);
resultMsg.setMessage("回调处理失败");
return resultMsg;
@@ -338,7 +362,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