From c759b55471f47af64a3c92a3666b0485af77c1ec Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Fri, 24 Oct 2025 18:53:53 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
index fb93b6e..9ceaa38 100644
--- a/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
+++ b/trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java
@@ -153,14 +153,9 @@
.ne(ContractOrder::getOrderNo, order.getOrderNo())
);
- // 提前计算 currentPrice 与 order.getTradeAvgPrice() 的差值，避免重复计算
- BigDecimal priceDifference = currentPrice.subtract(order.getTradeAvgPrice());
-
- // 计算所有订单的收益
+ // 计算所有订单的收益+保证金
for (ContractOrder contractOrder : list) {
- BigDecimal profit = priceDifference
- .multiply(new BigDecimal("0.01"))
- .multiply(contractOrder.getVolumeOpen())
+ BigDecimal profit = contractOrder.getProfit().add(contractOrder.getDepositOpen())
.setScale(4, RoundingMode.DOWN);
earnings = earnings.add(profit); // 累加收益
--
Gitblit v1.9.3