From 905a11a3153b3b6066291af67f60381137260b5f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Mon, 24 Mar 2025 17:13:20 +0800
Subject: [PATCH] 1

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 0cbb865..4a260c1 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
@@ -527,7 +527,7 @@
                 f.setUnitAmount(unitAmount);
                 f.setDepositOpen(f.getDepositOpen().add(applyOrder.getMoney()));
                 f.setDeposit(f.getDeposit().add(applyOrder.getMoney()));
-                f.setTradeAvgPrice((f.getTradeAvgPrice().add(realtime.getClose())).divide(new BigDecimal(2)));
+                f.setTradeAvgPrice((f.getTradeAvgPrice().add(realtime.getClose())).divide(new BigDecimal(2)).setScale(4, RoundingMode.DOWN));
 
                 BigDecimal fee = BigDecimal.ZERO;
                 if (f.getLeverRate() != null) {
@@ -536,9 +536,10 @@
                     fee = fee.setScale(4, RoundingMode.DOWN);  // 保留两位小数
                     f.setFee(f.getFee().add(fee));
                 }
-                double number = strongLevelCalculationService.countSheets(f.getDepositOpen().doubleValue(), f.getLeverRate().intValue(), 0.01, realtime.getClose().doubleValue());
+                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));
+                f.setLeverRate(applyOrder.getLeverRate());
 
                 walletService.updateMoney(f.getSymbol(), f.getPartyId(), BigDecimal.ZERO.subtract(applyOrder.getDeposit()), BigDecimal.ZERO
                         , Constants.MONEYLOG_CATEGORY_CONTRACT, Constants.WALLET_USDT, Constants.MONEYLOG_CONTENT_CONTRACT_OPEN, "委托单,订单号[" + f.getOrderNo() + "]"

--
Gitblit v1.9.3