From 640ccb9229224642515527daf87f308a7aa9bdf4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 10 Jun 2026 11:47:26 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java | 48 ++++++++++++++++++++++++------------------------
1 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
index 6c46c49..eb62630 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiWithdrawController.java
@@ -103,29 +103,29 @@
// 交易所提现是否需要资金密码
String exchange_withdraw_need_safeword = this.sysparaService.find("exchange_withdraw_need_safeword").getSvalue();
if(StringUtils.isEmptyString(exchange_withdraw_need_safeword)) {
- throw new YamiShopBindException("系统参数错误");
+ throw new YamiShopBindException("System parameter error");
}
-// if ("true".equals(exchange_withdraw_need_safeword)) {
-//
-// if (StringUtils.isEmptyString(safeword)) {
-// throw new YamiShopBindException("资金密码不能为空");
-// }
-//
-// if (safeword.length() < 6 || safeword.length() > 12) {
-// throw new YamiShopBindException("资金密码必须6-12位");
-// }
-// if (!userService.checkLoginSafeword(SecurityUtils.getUser().getUserId(),safeword)){
-// throw new YamiShopBindException("资金密码错误");
-// }
-// }
+ if ("true".equals(exchange_withdraw_need_safeword)) {
+
+ if (StringUtils.isEmptyString(safeword)) {
+ throw new YamiShopBindException("Fund password cannot be empty");
+ }
+
+ if (safeword.length() < 6 || safeword.length() > 12) {
+ throw new YamiShopBindException("Fund password must be 6-12 characters");
+ }
+ if (!userService.checkLoginSafeword(SecurityUtils.getUser().getUserId(),safeword)){
+ throw new YamiShopBindException("Incorrect fund password");
+ }
+ }
// 获取资金账户（capital）
- CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
+ /*CapitaltWallet capitaltWallet = capitaltWalletService.getOne(new LambdaQueryWrapper<>(CapitaltWallet.class)
.eq(CapitaltWallet::getUserId, partyId).last(" limit 1 "));
if(capitaltWallet.getMoney().compareTo(new BigDecimal(amount)) < 0){
throw new YamiShopBindException("Insufficient available balance for withdrawal！");
- }
+ }*/
this.sessionTokenService.del(session_token);
Withdraw withdraw = new Withdraw();
@@ -136,20 +136,20 @@
withdraw.setTx("");
//获取商户支持币种
- List<Coin> coinList = udunClient.listSupportCoin(false);
+ /*List<Coin> coinList = udunClient.listSupportCoin(false);
String channelName = channel.replace("_", "");
Coin coin = coinList.stream().filter(x -> x.getName().replace("-","").equals(channelName)).findFirst().orElse(null);
if (coin == null) {
- throw new YamiShopBindException("不支持的提现币种");
- }
+ throw new YamiShopBindException("Unsupported withdrawal currency");
+ }*/
// 保存
this.withdrawService.saveApply(withdraw, channel, null);
- ResultMsg resultMsg = udunClient.withdraw(from, withdraw.getVolume(), coin.getMainCoinType(),
+ /*ResultMsg resultMsg = udunClient.withdraw(from, withdraw.getVolume(), coin.getMainCoinType(),
coin.getCoinType(), withdraw.getOrderNo(), null);
if (resultMsg.getCode() != HttpStatus.HTTP_OK) {
log.error("withdraw:{}", JSONUtil.toJsonStr(resultMsg));
throw new UdunException(resultMsg.getCode(), resultMsg.getMessage());
- }
+ }*/
resultObject.setCode(0);
} catch (YamiShopBindException e) { // 1. 显式捕获业务异常，优先处理
resultObject.setCode(1);
@@ -225,7 +225,7 @@
public Result get(@RequestParam String order_no) throws IOException {
Withdraw withdraw = this.withdrawService.findByOrderNo(order_no);
if (withdraw==null){
- throw new YamiShopBindException("订单不存在!");
+ throw new YamiShopBindException("Order does not exist!");
}
Map<String, Object> map = new HashMap<String, Object>();
map.put("order_no", withdraw.getOrderNo());
@@ -255,10 +255,10 @@
page_no = "1";
}
if (!StringUtils.isInteger(page_no)) {
- throw new YamiShopBindException("页码不是整数");
+ throw new YamiShopBindException("Page number must be an integer");
}
if (Integer.valueOf(page_no).intValue() <= 0) {
- throw new YamiShopBindException("页码不能小于等于0");
+ throw new YamiShopBindException("Page number must be greater than 0");
}
int page_no_int = Integer.valueOf(page_no).intValue();
List<Map<String, Object>> data = this.walletLogService.pagedQueryWithdraw(page_no_int, 10, SecurityUtils.getUser().getUserId(), "1").getRecords();
--
Gitblit v1.9.3