From b72f338db8e323b412b794eecc7a0460943b3e4b Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 09 May 2026 17:24:12 +0800
Subject: [PATCH] feat(gateApi): 增强网格交易系统功能

---
 src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java |   54 +++++++++++++++++++++++++++---------------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java b/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
index dc72762..4e695c3 100644
--- a/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
+++ b/src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java
@@ -1,7 +1,6 @@
 package com.xcong.excoin.modules.gateApi;
 
 import io.gate.gateapi.ApiClient;
-import io.gate.gateapi.GateApiException;
 import io.gate.gateapi.api.FuturesApi;
 import io.gate.gateapi.models.FuturesInitialOrder;
 import io.gate.gateapi.models.FuturesOrder;
@@ -124,40 +123,34 @@
     }
 
     /**
-     * 异步创建止盈条件单。
-     * <p>使用 Gate 的 PriceTriggeredOrder:服务器监控价格,达到触发价后自动平仓。
-     * 如果账户已有同方向同规则的条件单(label=UNIQUE),自动清除后重试一次。
+     * 异步创建止盈条件单(仓位计划止盈止损)。
+     *
+     * <p>使用 Gate 的 {@code PriceTriggeredOrder} API:服务器监控价格,达到触发价后自动平指定张数。
+     * order_type 使用 {@code plan-close-*-position}(仓位计划止盈止损),
+     * 支持指定 size 部分平仓,多次触发的止盈单互不影响。
+     *
+     * <h3>为何不用 close-*-position</h3>
+     * {@code close-long-position} / {@code close-short-position} 仅支持全部平仓(size=0),
+     * 且双仓模式还需额外设置 {@code auto_size}。网格策略需要指定张数部分平仓,
+     * 因此必须使用 {@code plan-close-long-position} / {@code plan-close-short-position}。
      *
      * @param triggerPrice 触发价格
      * @param rule         触发规则(NUMBER_1: ≥ 触发价,NUMBER_2: ≤ 触发价)
-     * @param orderType    stop 类型(close-long-position / close-short-position)
-     * @param autoSize     双仓平仓方向(close_long / close_short)
+     * @param orderType    stop 类型(plan-close-long-position / plan-close-short-position)
+     * @param size         平仓张数(正=平空,负=平多)
      */
     public void placeTakeProfit(BigDecimal triggerPrice,
                                  FuturesPriceTrigger.RuleEnum rule,
                                  String orderType,
-                                 String autoSize) {
+                                 String size) {
         executor.execute(() -> {
-            FuturesPriceTriggeredOrder order = buildTriggeredOrder(triggerPrice, rule, orderType, autoSize);
+            FuturesPriceTriggeredOrder order = buildTriggeredOrder(triggerPrice, rule, orderType, size);
             try {
                 TriggerOrderResponse response = futuresApi.createPriceTriggeredOrder(SETTLE, order);
-                log.info("[TradeExec] 止盈单已创建, 触发价:{}, 类型:{}, id:{}",
-                        triggerPrice, orderType, response.getId());
-            } catch (GateApiException e) {
-                if ("AUTO_USER_EXIST_POSITION_ORDER".equals(e.getErrorLabel())) {
-                    log.warn("[TradeExec] 止盈单已存在,清除旧单后重试");
-                    try {
-                        futuresApi.cancelPriceTriggeredOrderList(SETTLE, contract);
-                        TriggerOrderResponse response = futuresApi.createPriceTriggeredOrder(SETTLE, order);
-                        log.info("[TradeExec] 止盈单重试成功, 触发价:{}, id:{}", triggerPrice, response.getId());
-                    } catch (Exception retryEx) {
-                        log.error("[TradeExec] 止盈单重试失败", retryEx);
-                    }
-                } else {
-                    log.error("[TradeExec] 止盈单创建失败, 触发价:{}", triggerPrice, e);
-                }
+                log.info("[TradeExec] 止盈单已创建, 触发价:{}, 类型:{}, size:{}, id:{}",
+                        triggerPrice, orderType, size, response.getId());
             } catch (Exception e) {
-                log.error("[TradeExec] 止盈单创建失败, 触发价:{}", triggerPrice, e);
+                log.error("[TradeExec] 止盈单创建失败, 触发价:{}, size:{}", triggerPrice, size, e);
             }
         });
     }
@@ -178,13 +171,21 @@
 
     /**
      * 构建 FuturesPriceTriggeredOrder 对象。
+     *
      * <p>策略=0(价格触发),price_type=0(最新价),expiration=0(永不过期),
      * tif=IOC(立即成交或取消),reduce_only=true(只减仓不开新仓)。
+     *
+     * <h3>size 参数说明</h3>
+     * <ul>
+     *   <li>plan-close-long-position:size 为负,表示平多仓多少张</li>
+     *   <li>plan-close-short-position:size 为正,表示平空仓多少张</li>
+     * </ul>
+     * 每次只平指定张数,不会全平仓位,多个止盈单可并存且互不影响。
      */
     private FuturesPriceTriggeredOrder buildTriggeredOrder(BigDecimal triggerPrice,
                                                             FuturesPriceTrigger.RuleEnum rule,
                                                             String orderType,
-                                                            String autoSize) {
+                                                            String size) {
         FuturesPriceTrigger trigger = new FuturesPriceTrigger();
         trigger.setStrategyType(FuturesPriceTrigger.StrategyTypeEnum.NUMBER_0);
         trigger.setPriceType(FuturesPriceTrigger.PriceTypeEnum.NUMBER_0);
@@ -194,11 +195,10 @@
 
         FuturesInitialOrder initial = new FuturesInitialOrder();
         initial.setContract(contract);
-        initial.setSize(0L);
+        initial.setSize(Long.parseLong(size));
         initial.setPrice("0");
         initial.setTif(FuturesInitialOrder.TifEnum.IOC);
         initial.setReduceOnly(true);
-        initial.setAutoSize(autoSize);
 
         FuturesPriceTriggeredOrder order = new FuturesPriceTriggeredOrder();
         order.setTrigger(trigger);

--
Gitblit v1.9.1