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 | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 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 44029ba..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); // 累加收益
@@ -263,12 +258,18 @@
//判断买涨还是买跌"buy":买(多) "sell":卖(空)
if(order.getDirection().equals("buy")){
if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
- /**
- * 触发全仓强平
- */
- log.info("------------------currentPrice-------------："+currentPrice);
- log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
- log.info("------------------开多强平-------------");
+ /**
+ * 触发全仓强平
+ */
+ log.info("------------------currentPrice-------------："+currentPrice);
+ log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
+ log.info("------------------开多强平-------------");
+
+ double number = strongLevelCalculationService.countSheets(earnings.doubleValue(), order.getLeverRate().intValue(), 0.01, order.getTradeAvgPrice().doubleValue());
+ BigDecimal qpPoint = currentPrice.subtract(order.getTradeAvgPrice());
+ BigDecimal qpAmount = qpPoint.multiply(new BigDecimal("0.01")).multiply(new BigDecimal(number)).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getOrderNo()+"--------强平收益:"+amount);
+ order.setProfit(qpAmount);
this.contractOrderService.allClose(order.getPartyId());
}
@@ -280,6 +281,11 @@
log.info("------------------currentPrice-------------："+currentPrice);
log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
log.info("------------------开空强平-------------");
+ double number = strongLevelCalculationService.countSheets(earnings.doubleValue(), order.getLeverRate().intValue(), 0.01, order.getTradeAvgPrice().doubleValue());
+ BigDecimal qpPoint = currentPrice.subtract(order.getTradeAvgPrice());
+ BigDecimal qpAmount = qpPoint.multiply(new BigDecimal("0.01")).multiply(new BigDecimal(number)).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getOrderNo()+"--------强平收益:"+amount);
+ order.setProfit(qpAmount.negate());
this.contractOrderService.allClose(order.getPartyId());
}
--
Gitblit v1.9.3