From 5c3737c9718ad01a4d2a4a02c09548fcc3966438 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Sat, 09 May 2026 11:09:21 +0800
Subject: [PATCH] fix(trade): 修复止盈订单数量设置和日志记录问题
---
src/main/java/com/xcong/excoin/modules/gateApi/GateTradeExecutor.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 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..9dbe520 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;
@@ -126,38 +125,25 @@
/**
* 异步创建止盈条件单。
* <p>使用 Gate 的 PriceTriggeredOrder：服务器监控价格，达到触发价后自动平仓。
- * 如果账户已有同方向同规则的条件单（label=UNIQUE），自动清除后重试一次。
+ * 每次只平指定张数（size），多次触发的止盈单互不影响。
*
* @param triggerPrice 触发价格
* @param rule 触发规则（NUMBER_1: ≥ 触发价，NUMBER_2: ≤ 触发价）
* @param orderType stop 类型（close-long-position / close-short-position）
- * @param autoSize 双仓平仓方向（close_long / close_short）
+ * @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);
}
});
}
@@ -184,7 +170,7 @@
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 +180,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