From 2cfba883471ec6dabd94ae07e5f7df5dc9df6912 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 14 Oct 2025 20:23:19 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
index 3053a7b..787e51f 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java
@@ -567,12 +567,14 @@
                 f.setTradeAvgPrice((f.getTradeAvgPrice().add(realtime.getClose())).divide(new BigDecimal(2)).setScale(4, RoundingMode.DOWN));
 
                 BigDecimal fee = BigDecimal.ZERO;
-                if (f.getLeverRate() != null) {
-
-                    fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
-                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
-                    f.setFee(f.getFee().add(fee));
-                }
+//                if (f.getLeverRate() != null) {
+//
+//                    fee = applyOrder.getDeposit().multiply(f.getLeverRate()).multiply(item.getUnitFee());
+//                    fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
+//                    f.setFee(f.getFee().add(fee));
+//                }
+                fee = applyOrder.getFee();
+                f.setFee(applyOrder.getFee());
                 double number = strongLevelCalculationService.countSheets(f.getDepositOpen().doubleValue(), applyOrder.getLeverRate().intValue(), 0.01, realtime.getClose().doubleValue());
                 f.setVolumeOpen(new BigDecimal(number));
                 f.setVolume(new BigDecimal(number));

--
Gitblit v1.9.3