From 96106139019751f4a45d957ff6969f428d602d42 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Fri, 27 Feb 2026 18:39:09 +0800
Subject: [PATCH] 合约

---
 trading-order-service/src/main/java/com/yami/trading/service/contract/ContractOrderCalculationServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 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 b84693c..8dc7837 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
@@ -174,7 +174,7 @@
             earnings = earnings.add(order.getDepositOpen());
         } else {
             // 如果不符合条件,直接使用 order.getDepositOpen() 作为收益
-            earnings = order.getDepositOpen();
+            earnings = order.getDepositOpen().add(order.getAddDepositOpen());
         }
 
         if(ContractOrder.DIRECTION_BUY.equals(order.getDirection())){
@@ -268,6 +268,9 @@
                     /**
                      * 触发全仓强平
                      */
+                    log.info("------------------currentPrice-------------:"+currentPrice);
+                    log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
+                    log.info("------------------开多强平-------------");
                     this.contractOrderService.allClose(order.getPartyId());
 
                 }
@@ -276,6 +279,9 @@
                     /**
                      * 触发全仓强平
                      */
+                    log.info("------------------currentPrice-------------:"+currentPrice);
+                    log.info("------------------order.getForceClosePrice()-------------"+order.getForceClosePrice());
+                    log.info("------------------开空强平-------------");
                     this.contractOrderService.allClose(order.getPartyId());
 
                 }

--
Gitblit v1.9.3