From 99924733282cb812aab96b0b0be1632f4d0bbc7c Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 15 Oct 2025 19:36:34 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/exchange/ApiChannelBlockchainController.java | 73 ++++++------------------------------
1 files changed, 12 insertions(+), 61 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 869413b..d42a9b4 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
@@ -8,14 +8,17 @@
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.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.*;
import com.yami.trading.api.UD.Address;
import com.yami.trading.bean.exchange.PartyBlockchain;
import com.yami.trading.bean.model.ChannelBlockchain;
import com.yami.trading.bean.model.RechargeBlockchainOrder;
import com.yami.trading.bean.model.User;
-import com.yami.trading.bean.vo.RechargeAddressVo;
import com.yami.trading.common.constants.Constants;
import com.yami.trading.common.domain.Result;
import com.yami.trading.common.exception.YamiShopBindException;
@@ -32,6 +35,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;
@@ -39,7 +44,10 @@
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
+import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -65,6 +73,8 @@
private SysUserService sysUserService;
@Autowired
RechargeBlockchainOrderService rechargeBlockchainOrderService;
+ @Autowired
+ protected UserService partyService;
private final String gateway = "https://sig11.udun.io";
private final String merchantKey = "7fd79e4ed59e7c31e1fa2e13d64f7e6c";
@@ -148,8 +158,6 @@
return cbc;
}).collect(Collectors.toList());
}
-
- //后台设置地址
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());
@@ -165,67 +173,10 @@
data.get(i).setAddress(null);
}
}
-
-// String partyId =SecurityUtils.getUser().getUserId();
-// if(!StringUtils.isNotEmpty(partyId)){
-// throw new YamiShopBindException("请登录！");
-// }
-// if (0 == this.sysparaService.find("can_recharge").getInteger()) {
-// return Result.failed("请联系客服充值");
-// }
-// RechargeAddressVo rechargeAddressVo = new RechargeAddressVo();
-//
-// //获取u盾地址
-// //获取商户支持币种
-// List<Coin> coinList = listSupportCoin(merchantId,false);
-// //创建地址
-// coinList.forEach(f->{
-// Address address = new Address();
-// if(f.getName().equals("BTC")){
-// String ress = (String)redisTemplate.opsForValue().get(partyId + "BTC");
-// if(StringUtils.isNotEmpty(ress)){
-// rechargeAddressVo.setAddress(ress);
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// }else{
-// address = createAddress(f.getMainCoinType(),null,null,null);
-// rechargeAddressVo.setAddress(address.getAddress());
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// redisTemplate.opsForValue().set(partyId + "BTC",address.getAddress());
-// }
-// }else if(f.getName().equals("ETH")){
-// String ress = (String)redisTemplate.opsForValue().get(partyId + "ETH");
-// if(StringUtils.isNotEmpty(ress)){
-// rechargeAddressVo.setAddress(ress);
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// }else{
-// address = createAddress(f.getMainCoinType(),null,null,null);
-// rechargeAddressVo.setAddress(address.getAddress());
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// redisTemplate.opsForValue().set(partyId + "ETH",address.getAddress());
-// }
-// }else if(f.getName().equals("USDT")){
-// String ress = (String)redisTemplate.opsForValue().get(partyId + "USDT");
-// if(StringUtils.isNotEmpty(ress)){
-// rechargeAddressVo.setAddress(ress);
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// }else{
-// address = createAddress(f.getMainCoinType(),null,null,null);
-// rechargeAddressVo.setAddress(address.getAddress());
-// rechargeAddressVo.setCoin(coin);
-// rechargeAddressVo.setBlockchainName(coin);
-// redisTemplate.opsForValue().set(partyId + "USDT",address.getAddress());
-// }
-// }
-// });
-// return Result.succeed(rechargeAddressVo);
return Result.succeed(data);
}
+
public List<Coin> listSupportCoin(String merchantId , boolean showBalance) {
Map<String, Object> params = new HashMap<>();
params.put("merchantId", merchantId);
--
Gitblit v1.9.3