From e78077d7a8a30f6762dfb68ece078faab7f2cd0a Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 29 Jun 2026 11:47:30 +0800
Subject: [PATCH] [Gate] 盈亏达标(净权益{}>目标{}),重置策略

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
index 8c9fe92..52f9633 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -364,6 +364,7 @@
      * @param closePrice K 线收盘价(即当前最新成交价)
      */
     public void onKline(BigDecimal closePrice) {
+
         lastKlinePrice = closePrice;
 
         //初始化0位置的开仓,并且用空的开仓价格,作为价格基准来划分网格
@@ -391,9 +392,7 @@
             return;
         }
 
-
-//        checkProfitAndReset();
-
+        checkProfitAndReset();
 
         if (state == StrategyState.ACTIVE &&
                 longActive == false &&
@@ -417,20 +416,10 @@
             BigDecimal target = initialPrincipal.add(config.getExpectedProfit());
 
             FuturesAccount account = futuresApi.listFuturesAccounts(SETTLE);
-            BigDecimal unrealisedPnl = new BigDecimal(account.getCrossUnrealisedPnl());
-            BigDecimal available = new BigDecimal(account.getCrossAvailable());
-            BigDecimal totalEquity = unrealisedPnl.add(available);
+            BigDecimal totalEquity = new BigDecimal(account.getTotal());
 
-            // 估算平仓手续费:(多仓张数+空仓张数) × 合约面值 × 当前价 × taker费率
-            BigDecimal totalSize = longPositionSize.abs().add(shortPositionSize.abs());
-            BigDecimal closeContractValue =
-                    totalSize.multiply(config.getContractMultiplier()).multiply(lastKlinePrice != null ? lastKlinePrice : BigDecimal.ZERO);
-            BigDecimal estimatedFee = closeContractValue.multiply(TAKER_FEE_RATE);
-            BigDecimal netEquity = totalEquity.subtract(estimatedFee);
-            log.info("[Gate] 盈亏检查,总张数:{}, upl:{}, avail:{}, 合计:{}, 估手续费:{}, 净权益:{}, 目标:{}",
-                    totalSize,unrealisedPnl, available, totalEquity, estimatedFee, netEquity, target);
-            if (netEquity.compareTo(target) > 0) {
-                log.info("[Gate] 盈亏达标(净权益{}>目标{}),重置策略", netEquity, target);
+            if (totalEquity.compareTo(target) > 0) {
+                log.info("[Gate] 盈亏达标(净权益{}>目标{}),重置策略", totalEquity, target);
                 state = StrategyState.STOPPED;
                 try {
                     futuresApi.cancelPriceTriggeredOrderList(SETTLE, config.getContract());

--
Gitblit v1.9.1