From b967bac24b2fd662ac3b8826700fb76c26690aec Mon Sep 17 00:00:00 2001
From: zyy3 <zyy3@zy.com>
Date: Tue, 02 Dec 2025 00:27:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
index 74e182c..e58951f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java
@@ -431,13 +431,22 @@
Syspara paramMin = sysparaService.find(symbolCodeMin);
Syspara paramMax = null;
- if (paramMin == null || (paramMax = sysparaService.find(symbolCodeMax)) == null) {
+ if (paramMin == null && (paramMax = sysparaService.find(symbolCodeMax)) == null) {
// 不需要默认的，直接返回
if (!needDefault) {
return map;
}
// 2、没有对应该币种提现额度配置，使用默认的
map.put("limit", this.sysparaService.find(defaultMinCode).getSvalue());
+ map.put("limitMax", this.sysparaService.find(defaultMaxCode).getSvalue());
+ return map;
+ } else if (paramMin != null && (paramMax = sysparaService.find(symbolCodeMax)) == null){
+ // 不需要默认的，直接返回
+ if (!needDefault) {
+ return map;
+ }
+ // 2、没有对应该币种提现额度配置，使用默认的
+ map.put("limit", paramMin.getSvalue());
map.put("limitMax", this.sysparaService.find(defaultMaxCode).getSvalue());
return map;
}
@@ -552,7 +561,7 @@
*/
double withdraw_fee = Double.valueOf(sysparaService.find("withdraw_fee").getSvalue());
double fee = 0;
- if ("fixed".equals(withdraw_fee_type)) {
+ /*if ("fixed".equals(withdraw_fee_type)) {
fee = withdraw_fee;
}
if ("rate".equals(withdraw_fee_type)) {
@@ -560,9 +569,9 @@
fee = Arith.mul(withdraw.getVolume().doubleValue(), withdraw_fee);
}
if ("part".equals(withdraw_fee_type)) {
- /**
+ *//**
* 提现手续费part分段的值
- */
+ *//*
String withdraw_fee_part = sysparaService.find("withdraw_fee_part").getSvalue();
String[] withdraw_fee_parts = withdraw_fee_part.split(",");
for (int i = 0; i < withdraw_fee_parts.length; i++) {
@@ -574,7 +583,7 @@
}
i++;
}
- }
+ }*/
/**
* 当日提现次数是否超过
*/
--
Gitblit v1.9.3