From b865e7f64ad0a1edf9b795c0e66a1ba13b0d6aca Mon Sep 17 00:00:00 2001
From: peter <14100000001@qq.com>
Date: Sat, 06 Sep 2025 14:20:40 +0800
Subject: [PATCH] BUG
---
trading-order-service/src/main/java/com/yami/trading/service/impl/WithdrawServiceImpl.java | 4 ++--
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java | 13 +++++++++++++
trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java | 2 +-
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractApplyOrderService.java | 2 +-
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
index bb144e5..ff92be0 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiContractApplyOrderController.java
@@ -110,6 +110,19 @@
data.put("fee", item.getUnitFee());
List<ItemLeverageDTO> lLeverageDTO = itemLeverageService.findByItemId(item.getUuid());
+ // 对list进行排序，按照lever_rate字段升序排列
+ Collections.sort(lLeverageDTO, new Comparator<ItemLeverageDTO>() {
+ @Override
+ public int compare(ItemLeverageDTO o1, ItemLeverageDTO o2) {
+ try {
+ Double rate1 = Double.valueOf(o1.getLeverRate());
+ Double rate2 = Double.valueOf(o2.getLeverRate());
+ return rate1.compareTo(rate2);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+ });
data.put("lever", lLeverageDTO);
String partyId = SecurityUtils.getCurrentUserId();
diff --git a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
index 9d82eac..3b3b8f2 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/api/controller/ApiNewsController.java
@@ -55,7 +55,7 @@
}
if (StringUtils.isNotEmpty(news.getImgUrl())) {
- news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
+// news.setImgUrl(Constants.IMAGES_HTTP+news.getImgUrl());
}
return Result.succeed(news);
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractApplyOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractApplyOrderService.java
index 3ec63b0..57c71cc 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractApplyOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractApplyOrderService.java
@@ -223,7 +223,7 @@
* 加上杠杆
*/
- BigDecimal fee = order.getDeposit().multiply(order.getLeverRate()).multiply(item.getUnitFee());
+ BigDecimal fee = order.getDeposit().multiply(item.getUnitFee());
fee = fee.setScale(4, RoundingMode.DOWN); // 保留两位小数
order.setFee(fee);
}
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 d58cce2..bf53322 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
@@ -135,9 +135,9 @@
String symbol = "";
if (withdraw.getMethod().indexOf("BTC") != -1) {
- symbol = "btc";
+ symbol = "btcusdt";
} else if (withdraw.getMethod().indexOf("ETH") != -1) {
- symbol = "eth";
+ symbol = "btcusdt";
} else {
symbol = "usdt";
}
--
Gitblit v1.9.3