From c5b488df437af1edb49daec97b5e7b04b7c6328e Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 14 Aug 2025 19:26:24 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java | 8 ++++----
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java | 10 +++++-----
trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java | 4 +++-
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
index e5bf2e2..b111b53 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiBankCardController.java
@@ -150,7 +150,7 @@
// 已用额度
double weekWithdraw = this.weekWithdraw(user.getUserId());
if (Arith.add(weekWithdraw, withdrawVolumn) > limit) {
- throw new YamiShopBindException("提现不得大于限额");
+ throw new YamiShopBindException("Withdrawal amount cannot exceed the limit.");
}
}
}
@@ -312,11 +312,11 @@
}
String withdraw_limit = this.sysparaService.find("withdraw_limit").getSvalue();
if (coin_amount_double < Double.valueOf(withdraw_limit)) {
- throw new YamiShopBindException("提现不得小于限额");
+ throw new YamiShopBindException("Withdrawal amount must not be less than the limit.");
}
String withdraw_limit_max = this.sysparaService.find("withdraw_limit_max").getSvalue();
if (coin_amount_double > Double.valueOf(withdraw_limit_max)) {
- throw new YamiShopBindException("提现不得大于限额");
+ throw new YamiShopBindException("Withdrawal amount cannot exceed the limit.");
}
// 检测银行卡用户当日提现次数
Object obj = this.sysparaService.find("bank_card_withdraw_limit_num");
@@ -328,7 +328,7 @@
if (bank_card_withdraw_limit_num > 0 && c2cOrders != null) {
if (c2cOrders.size() >= bank_card_withdraw_limit_num) {
- throw new YamiShopBindException("当日可提现次数不足");
+ throw new YamiShopBindException("The number of times funds can be withdrawn on the same day is insufficient.");
}
}
}
@@ -341,7 +341,7 @@
String[] withdraw_time = withdraw_limit_time.split("-");
String dateString = sdf.format(date);
if (dateString.compareTo(withdraw_time[0]) < 0 || dateString.compareTo(withdraw_time[1]) > 0) {
- throw new YamiShopBindException("不在可提现时间内");
+ throw new YamiShopBindException("Not within the available withdrawal period");
}
}
// 周提现额度限制开关
diff --git a/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java b/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
index 0ca1775..57ded7e 100644
--- a/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
+++ b/trading-order-common/src/main/java/com/yami/trading/common/constants/TipConstants.java
@@ -96,7 +96,7 @@
ACTION_MAP.put(OTCORDER, "/normal/adminOtcOrderAction!list.action");
ACTION_MAP.put(BANK_CARD_ORDER, "/c2c-bank_pay_order");
ACTION_MAP.put(USER_SAFEWORD_APPLY, "/user-relation-reset");
- ACTION_MAP.put(CONTRACT_ORDER, "/normal/adminContractOrderAction!list.action");
+ ACTION_MAP.put(CONTRACT_ORDER, "/cryptos-spots-cryptos-spots-transport");
ACTION_MAP.put(USER_SAFEWORD_APPLY+"-0", "/user-relation-reset");
ACTION_MAP.put(USER_SAFEWORD_APPLY+"-1", "/user-relation-reset");
@@ -139,6 +139,7 @@
MESSAGE_TYPE.put(KYC_HIGH_LEVEL, "3");
MESSAGE_TYPE.put(USER_SAFEWORD_APPLY, "4");
MESSAGE_TYPE.put(BANK_CARD_ORDER, "4");
+ MESSAGE_TYPE.put(CONTRACT_ORDER, "5");
// MESSAGE_MAP.put(BANK_CARD_ORDER, "您有{0}条新的银行卡订单");
// MESSAGE_MAP.put(USER_SAFEWORD_APPLY, "您有{0}条新的用户资金密码修改申请");
// MESSAGE_MAP.put(ONLINECHAT, "您有{0}条新的聊天消息");
@@ -154,6 +155,7 @@
DOM_MAP.put(RECHARGE, ".recharge_order_untreated_cout");
DOM_MAP.put(WITHDRAW, ".withdraw_order_untreated_cout");
DOM_MAP.put(KYC, ".kyc_untreated_cout");
+ DOM_MAP.put(CONTRACT_ORDER, ".contract_order_untreated_cout-0");
DOM_MAP.put(KYC_HIGH_LEVEL, ".kyc_high_level_untreated_cout");
DOM_MAP.put(BANK_CARD_ORDER, ".bank_card_order_untreated_cout");
DOM_MAP.put(USER_SAFEWORD_APPLY, ".user_safeword_apply_untreated_cout");
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 c31b132..f687e47 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
@@ -780,11 +780,11 @@
}
String withdraw_limit = sysparaService.find("withdraw_limit_" + symbol).getSvalue();
if (amount.doubleValue() < Double.valueOf(withdraw_limit)) {
- throw new YamiShopBindException("提现不得小于限额");
+ throw new YamiShopBindException("Withdrawal amount must not be less than the limit.");
}
String withdraw_limit_max = sysparaService.find("withdraw_limit_max").getSvalue();
if (amount.doubleValue() > Double.valueOf(withdraw_limit_max)) {
- throw new YamiShopBindException("提现不得大于限额");
+ throw new YamiShopBindException("Withdrawal amount cannot exceed the limit.");
}
/**
* 当日提现次数是否超过
@@ -793,7 +793,7 @@
List<Withdraw> withdraw_days = findAllByDate(withdraw.getUserId().toString());
if (withdraw_limit_num > 0 && withdraw_days != null) {
if (withdraw_days.size() >= withdraw_limit_num) {
- throw new YamiShopBindException("当日可提现次数不足");
+ throw new YamiShopBindException("The number of times funds can be withdrawn on the same day is insufficient.");
}
}
/**
@@ -808,7 +808,7 @@
//
String dateString = sdf.format(date);
if (dateString.compareTo(withdraw_time[0]) < 0 || dateString.compareTo(withdraw_time[1]) > 0) {
- throw new YamiShopBindException("不在可提现时间内");
+ throw new YamiShopBindException("Not within the available withdrawal periodNot within the available withdrawal period");
}
}
WithdrawFeeVo withdrawFeeVo = getFee(withdraw.getMethod(), withdraw.getAmount().doubleValue());
--
Gitblit v1.9.3