fix(gateApi): 修复网格交易中持仓大小计算问题

Administrator

2026-09-30 c3e27beb584c9252f33b90729817bc2546b1297c

 src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java

@@ -30,7 +30,7 @@
 *   <tr><td>标识</td><td>id, gridPrice, upId, downId</td><td>编号、价格、双向链表指针</td></tr>
 *   <tr><td>多仓订单</td><td>hasLongOrder, longOrderId, longTraderParam</td><td>是否有挂单、订单ID、完整参数</td></tr>
 *   <tr><td>空仓订单</td><td>hasShortOrder, shortOrderId, shortTraderParam</td><td>是否有挂单、订单ID、完整参数</td></tr>
 *   <tr><td>止盈</td><td>longTakeProfitOrderId, shortTakeProfitOrderId</td><td>止盈条件单ID</td></tr>
 *   <tr><td>止盈</td><td>longTakeProfitOrderIds, shortTakeProfitOrderIds</td><td>止盈条件单ID列表</td></tr>
 * </table>
 *
 * <h3>6 个全局 O(1) 索引</h3>
@@ -83,14 +83,29 @@
    private List<String> longOrderIds = new ArrayList<>();
    /** 空仓挂单订单 ID 列表（支持同一网格多个挂单，由止损追单产生） */
    private List<String> shortOrderIds = new ArrayList<>();
    /** 多仓止盈订单 ID */
    private String longTakeProfitOrderId;
    /** 空仓止盈订单 ID */
    private String shortTakeProfitOrderId;
    /** 多仓止盈订单 ID 列表（支持一网格多笔止盈单：基础止盈 + 超额止盈并行挂单） */
    private List<String> longTakeProfitOrderIds = new ArrayList<>();
    /** 空仓止盈订单 ID 列表（支持一网格多笔止盈单：基础止盈 + 超额止盈并行挂单） */
    private List<String> shortTakeProfitOrderIds = new ArrayList<>();
    /** 多仓止损订单 ID 列表（支持一个网格多个止损单） */
    private List<String> longStopLossOrderIds = new ArrayList<>();
    /** 空仓止损订单 ID 列表（支持一个网格多个止损单） */
    private List<String> shortStopLossOrderIds = new ArrayList<>();

    /**
     * 止损追单是否正在进行中（防重入标记）。
     * 同一网格存在多个入场单且相近时间成交时，确保只有第一次 extend 触发止损挂单，
     * 后续入场单成交仅移除订单记录，不再重复触发 cancelAll + extend 流程。
     * 异步回调全部完成后由 placeStopLossOrders 中计数器归零时重置。
     */
    private volatile boolean extendStopLossInProgress = false;

    /**
     * 是否有待重挂的止损追单请求。
     * 当入场单成交因 extendStopLossInProgress=true 被跳过时置为 true，
     * 延展完成后由回调检查此标记并触发一次仓位重查+重挂，确保止损覆盖最新持仓数。
     */
    private volatile boolean pendingStopLossReExtend = false;

    /** 索引重建锁，保证 refreshIndices() 与计数读取之间互斥，避免 clear→rebuild 窗口期读到 0 */
    private static final Object INDEX_LOCK = new Object();
@@ -248,7 +263,8 @@
        StringBuilder sb = new StringBuilder("\n========== 网格数据 ==========\n");
        for (GridElement e : sorted) {
            if (e.isHasLongOrder() || e.isHasShortOrder()
                    || e.hasLongStopLossOrders() || e.hasShortStopLossOrders()){
                    || e.hasLongStopLossOrders() || e.hasShortStopLossOrders()
                    || e.hasLongTakeProfitOrders() || e.hasShortTakeProfitOrders()){
                sb.append(String.format(
                        "  ID=%4d  价格=%s  up=%s  down=%s  多仓=%s(%s)  空仓=%s(%s)  多止盈=%s  空止盈=%s  多止损=%s  空止损=%s\n",
                        e.getId(),
@@ -259,8 +275,8 @@
                        e.hasLongOrderIds() ? String.join(",", e.getLongOrderIds()) : "-",
                        e.isHasShortOrder() ? "有" : "无",
                        e.hasShortOrderIds() ? String.join(",", e.getShortOrderIds()) : "-",
                        e.getLongTakeProfitOrderId() != null ? e.getLongTakeProfitOrderId() : "-",
                        e.getShortTakeProfitOrderId() != null ? e.getShortTakeProfitOrderId() : "-",
                        e.hasLongTakeProfitOrders() ? String.join(",", e.getLongTakeProfitOrderIds()) : "-",
                        e.hasShortTakeProfitOrders() ? String.join(",", e.getShortTakeProfitOrderIds()) : "-",
                        e.hasLongStopLossOrders() ? String.join(",", e.getLongStopLossOrderIds()) : "-",
                        e.hasShortStopLossOrders() ? String.join(",", e.getShortStopLossOrderIds()) : "-"
                ));
@@ -295,7 +311,7 @@
    public static List<GridElement> findAllShortOrders(BigDecimal currentPrice) {
        List<GridElement> result = new ArrayList<>();
        for (GridElement e : INDEX.values()) {
            if (e.isHasShortOrder() && e.getGridPrice().compareTo(currentPrice) < 0 && e.getShortTakeProfitOrderId() == null) {
            if (e.isHasShortOrder() && e.getGridPrice().compareTo(currentPrice) < 0 && !e.hasShortTakeProfitOrders()) {
                result.add(e);
            }
        }
@@ -311,7 +327,7 @@
    public static List<GridElement> findAllLongOrders(BigDecimal currentPrice) {
        List<GridElement> result = new ArrayList<>();
        for (GridElement e : INDEX.values()) {
            if (e.isHasLongOrder() && e.getGridPrice().compareTo(currentPrice) > 0 && e.getLongTakeProfitOrderId() == null) {
            if (e.isHasLongOrder() && e.getGridPrice().compareTo(currentPrice) > 0 && !e.hasLongTakeProfitOrders()) {
                result.add(e);
            }
        }
@@ -326,11 +342,11 @@
        for (String oId : e.getShortOrderIds()) {
            SHORT_ORDER_ID_INDEX.put(oId, e);
        }
        if (e.getLongTakeProfitOrderId() != null) {
            LONG_TP_ORDER_ID_INDEX.put(e.getLongTakeProfitOrderId(), e);
        for (String tpId : e.getLongTakeProfitOrderIds()) {
            LONG_TP_ORDER_ID_INDEX.put(tpId, e);
        }
        if (e.getShortTakeProfitOrderId() != null) {
            SHORT_TP_ORDER_ID_INDEX.put(e.getShortTakeProfitOrderId(), e);
        for (String tpId : e.getShortTakeProfitOrderIds()) {
            SHORT_TP_ORDER_ID_INDEX.put(tpId, e);
        }
        for (String slId : e.getLongStopLossOrderIds()) {
            LONG_SL_ORDER_ID_INDEX.put(slId, e);
@@ -363,8 +379,8 @@
        this.shortTraderParam = builder.shortTraderParam;
        this.upId = builder.upId;
        this.downId = builder.downId;
        this.longTakeProfitOrderId = builder.longTakeProfitOrderId;
        this.shortTakeProfitOrderId = builder.shortTakeProfitOrderId;
        if (builder.longTakeProfitOrderIds != null) this.longTakeProfitOrderIds.addAll(builder.longTakeProfitOrderIds);
        if (builder.shortTakeProfitOrderIds != null) this.shortTakeProfitOrderIds.addAll(builder.shortTakeProfitOrderIds);
        if (builder.longOrderIds != null) this.longOrderIds.addAll(builder.longOrderIds);
        if (builder.shortOrderIds != null) this.shortOrderIds.addAll(builder.shortOrderIds);
        if (builder.longStopLossOrderIds != null) this.longStopLossOrderIds.addAll(builder.longStopLossOrderIds);
@@ -465,19 +481,43 @@
    @Deprecated
    public void setShortOrderId(String orderId) { if (orderId != null) shortOrderIds.add(orderId); }

    // ==================== 多仓止盈订单 ID ====================
    // ==================== 多仓止盈订单 ID 列表 ====================

    /** @return 多仓止盈订单 ID */
    public String getLongTakeProfitOrderId() { return longTakeProfitOrderId; }
    /** 设置多仓止盈订单 ID */
    public void setLongTakeProfitOrderId(String longTakeProfitOrderId) { this.longTakeProfitOrderId = longTakeProfitOrderId; }
    /** @return 多仓止盈订单 ID 列表 */
    public List<String> getLongTakeProfitOrderIds() { return longTakeProfitOrderIds; }
    /** 添加多仓止盈订单 ID */
    public void addLongTakeProfitOrderId(String orderId) { if (orderId != null) longTakeProfitOrderIds.add(orderId); }
    /** 移除多仓止盈订单 ID */
    public boolean removeLongTakeProfitOrderId(String orderId) { return longTakeProfitOrderIds.remove(orderId); }
    /** 清空多仓止盈订单 ID */
    public void clearLongTakeProfitOrderIds() { longTakeProfitOrderIds.clear(); }
    /** @return 是否有止盈单 */
    public boolean hasLongTakeProfitOrders() { return !longTakeProfitOrderIds.isEmpty(); }
    /** @deprecated 返回最后一个止盈订单ID，用于单订单场景的兼容 */
    @Deprecated
    public String getLongTakeProfitOrderId() { return longTakeProfitOrderIds.isEmpty() ? null : longTakeProfitOrderIds.get(longTakeProfitOrderIds.size() - 1); }
    /** @deprecated 添加到列表，用于兼容旧调用 */
    @Deprecated
    public void setLongTakeProfitOrderId(String orderId) { if (orderId != null) longTakeProfitOrderIds.add(orderId); }

    // ==================== 空仓止盈订单 ID ====================
    // ==================== 空仓止盈订单 ID 列表 ====================

    /** @return 空仓止盈订单 ID */
    public String getShortTakeProfitOrderId() { return shortTakeProfitOrderId; }
    /** 设置空仓止盈订单 ID */
    public void setShortTakeProfitOrderId(String shortTakeProfitOrderId) { this.shortTakeProfitOrderId = shortTakeProfitOrderId; }
    /** @return 空仓止盈订单 ID 列表 */
    public List<String> getShortTakeProfitOrderIds() { return shortTakeProfitOrderIds; }
    /** 添加空仓止盈订单 ID */
    public void addShortTakeProfitOrderId(String orderId) { if (orderId != null) shortTakeProfitOrderIds.add(orderId); }
    /** 移除空仓止盈订单 ID */
    public boolean removeShortTakeProfitOrderId(String orderId) { return shortTakeProfitOrderIds.remove(orderId); }
    /** 清空空仓止盈订单 ID */
    public void clearShortTakeProfitOrderIds() { shortTakeProfitOrderIds.clear(); }
    /** @return 是否有止盈单 */
    public boolean hasShortTakeProfitOrders() { return !shortTakeProfitOrderIds.isEmpty(); }
    /** @deprecated 返回最后一个止盈订单ID，用于单订单场景的兼容 */
    @Deprecated
    public String getShortTakeProfitOrderId() { return shortTakeProfitOrderIds.isEmpty() ? null : shortTakeProfitOrderIds.get(shortTakeProfitOrderIds.size() - 1); }
    /** @deprecated 添加到列表，用于兼容旧调用 */
    @Deprecated
    public void setShortTakeProfitOrderId(String orderId) { if (orderId != null) shortTakeProfitOrderIds.add(orderId); }

    // ==================== 多仓止损订单 ID ====================

@@ -506,6 +546,17 @@
    public void clearShortStopLossOrderIds() { shortStopLossOrderIds.clear(); }
    /** @return 是否有止损单 */
    public boolean hasShortStopLossOrders() { return !shortStopLossOrderIds.isEmpty(); }

    // ==================== 止损追单防重入标记 ====================

    /** @return 止损追单是否正在进行中 */
    public boolean isExtendStopLossInProgress() { return extendStopLossInProgress; }
    /** 设置止损追单进行标记 */
    public void setExtendStopLossInProgress(boolean v) { this.extendStopLossInProgress = v; }
    /** @return 是否有待重挂请求 */
    public boolean isPendingStopLossReExtend() { return pendingStopLossReExtend; }
    /** 设置待重挂标记 */
    public void setPendingStopLossReExtend(boolean v) { this.pendingStopLossReExtend = v; }

    public static Builder builder() {
        return new Builder();
@@ -541,10 +592,10 @@
        private List<String> longOrderIds;
        /** 空仓挂单订单 ID 列表 */
        private List<String> shortOrderIds;
        /** 多仓止盈订单 ID */
        private String longTakeProfitOrderId;
        /** 空仓止盈订单 ID */
        private String shortTakeProfitOrderId;
        /** 多仓止盈订单 ID 列表 */
        private List<String> longTakeProfitOrderIds;
        /** 空仓止盈订单 ID 列表 */
        private List<String> shortTakeProfitOrderIds;
        /** 多仓止损订单 ID 列表 */
        private List<String> longStopLossOrderIds;
        /** 空仓止损订单 ID 列表 */
@@ -570,10 +621,10 @@
        public Builder longOrderIds(List<String> longOrderIds) { this.longOrderIds = longOrderIds; return this; }
        /** 设置空仓挂单订单 ID 列表 */
        public Builder shortOrderIds(List<String> shortOrderIds) { this.shortOrderIds = shortOrderIds; return this; }
        /** 设置多仓止盈订单 ID */
        public Builder longTakeProfitOrderId(String longTakeProfitOrderId) { this.longTakeProfitOrderId = longTakeProfitOrderId; return this; }
        /** 设置空仓止盈订单 ID */
        public Builder shortTakeProfitOrderId(String shortTakeProfitOrderId) { this.shortTakeProfitOrderId = shortTakeProfitOrderId; return this; }
        /** 设置多仓止盈订单 ID 列表 */
        public Builder longTakeProfitOrderIds(List<String> longTakeProfitOrderIds) { this.longTakeProfitOrderIds = longTakeProfitOrderIds; return this; }
        /** 设置空仓止盈订单 ID 列表 */
        public Builder shortTakeProfitOrderIds(List<String> shortTakeProfitOrderIds) { this.shortTakeProfitOrderIds = shortTakeProfitOrderIds; return this; }
        /** 设置多仓止损订单 ID 列表 */
        public Builder longStopLossOrderIds(List<String> longStopLossOrderIds) { this.longStopLossOrderIds = longStopLossOrderIds; return this; }
        /** 设置空仓止损订单 ID 列表 */