From eda5e973e9977ecb6490ba5d53f6e25515147fcc Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Sun, 17 Aug 2025 14:18:05 +0800
Subject: [PATCH] 11
---
trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 8a8377d..3c8ce1d 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
@@ -264,29 +264,35 @@
// 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("------------------开多强平-------------");
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("------------------开空强平-------------");
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