From 5bfeca1cc5b5263e17c068ca12fbaab1d51917f4 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 22 Oct 2025 13:37:35 +0800
Subject: [PATCH] 1
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 37 +++++++++++++++++++++++++++----------
1 files changed, 27 insertions(+), 10 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 00de97a..fb93b6e 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
@@ -115,9 +115,8 @@
*/
public void settle(ContractOrder order, String profit_loss, BigDecimal currentPrice, List<ContractOrder> partyContractOrders) {
-
-
Item item = itemService.findBySymbol(order.getSymbol());
+
/*
* 根据偏 差点数和手数算出盈亏金额
@@ -127,12 +126,13 @@
*/
BigDecimal point = currentPrice.subtract(order.getTradeAvgPrice());
BigDecimal amount = point.multiply(new BigDecimal("0.01")).multiply(order.getVolumeOpen()).setScale(4, BigDecimal.ROUND_DOWN);;
+ log.info(order.getSymbol()+"--------------当前点位："+currentPrice);
+ log.info(order.getOrderNo()+"--------收益:"+amount);
if (ContractOrder.DIRECTION_BUY.equals(order.getDirection())) {
order.setProfit(amount);
} else{
order.setProfit(amount.negate());
}
-
double faceValue = 0.01; // 合约面值（固定面值不能调整）
double maintenanceMarginRate = 0.004; // 维持保证金率（固定不变）
@@ -262,29 +262,46 @@
// if (profit.add(wallet.getMoney()).compareTo(BigDecimal.ZERO) <= 0) {
//判断买涨还是买跌"buy":买(多) "sell":卖(空)
if(order.getDirection().equals("buy")){
- if (currentPrice.toString().compareTo(order.getForceClosePrice()) <= 0) {//达到强平价
- /**
- * 触发全仓强平
- */
+ if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
+ /**
+ * 触发全仓强平
+ */
+ 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());
}
}else{
- if (currentPrice.toString().compareTo(order.getForceClosePrice())>= 0) {//达到强平价
+ if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice()))>= 0) {//达到强平价
/**
* 触发全仓强平
*/
+ 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());
}
}
} else {
if(order.getDirection().equals("buy")){
- if (currentPrice.toString().compareTo(order.getForceClosePrice()) <= 0) {//达到强平价
+ if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) <= 0) {//达到强平价
this.contractOrderService.saveClose(order.getPartyId().toString(), order.getOrderNo(),"强平");
}
}else{
- if (currentPrice.toString().compareTo(order.getForceClosePrice()) >= 0) {//达到强平价
+ if (currentPrice.compareTo(new BigDecimal(order.getForceClosePrice())) >= 0) {//达到强平价
this.contractOrderService.saveClose(order.getPartyId().toString(), order.getOrderNo(),"强平");
}
}
--
Gitblit v1.9.3