6cc2de8e5181d83dc5baa014d528da9e93e5c2a6..e8c7e18c54e2e325df67993bf14726105ef7e259
6 days ago Administrator
fix(gateApi): 修复网格交易跨度重启逻辑
e8c7e1 diff | tree
6 days ago Administrator
fix(gateApi): 修复网格交易止盈订单ID计算逻辑
052843 diff | tree
2 files modified
21 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java 15 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/gateApi/GateGridTradeService.java
@@ -651,6 +651,9 @@
                    int shortExcessCount = shortExcess.divide(shortGridQty, 0, RoundingMode.DOWN).intValue();
                    for (int i = 0; i < shortExcessCount; i++) {
                        int tpGridId = shortGridElement.getId() - 2 - i;
                        if (i > 0){
                            tpGridId = tpGridId - 1;
                        }
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                            continue;
@@ -693,6 +696,10 @@
                    int longExcessCount = longExcess.divide(longGridQty, 0, RoundingMode.DOWN).intValue();
                    for (int i = 0; i < longExcessCount; i++) {
                        int tpGridId = longGridElement.getId() + 2 + i;
                        if (i > 0){
                            tpGridId = tpGridId + 1;
                        }
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                            continue;
@@ -1331,6 +1338,14 @@
        if (span <= 0) {
            return;
        }
        // 检查是否还有剩余止盈单,只有多空止盈全部清空才继续
        if (GridElement.getLongTakeProfitCount() > 0 || GridElement.getShortTakeProfitCount() > 0) {
            log.info("[Gate] 尚有未触发止盈单, 暂不检查跨度重启 longTpCount:{}, shortTpCount:{}",
                    GridElement.getLongTakeProfitCount(), GridElement.getShortTakeProfitCount());
            return;
        }
        BigDecimal step = config.getStep();
        if (step == null || step.compareTo(BigDecimal.ZERO) == 0) {
            return;
src/main/java/com/xcong/excoin/modules/gateApi/GridElement.java
@@ -169,6 +169,12 @@
        return SHORT_TP_ORDER_ID_INDEX.get(orderId);
    }
    /** @return 当前多仓止盈单数量 */
    public static int getLongTakeProfitCount() { return LONG_TP_ORDER_ID_INDEX.size(); }
    /** @return 当前空仓止盈单数量 */
    public static int getShortTakeProfitCount() { return SHORT_TP_ORDER_ID_INDEX.size(); }
    /**
     * 根据多仓止损订单 ID 快速查找网格元素(O(1))。
     */