fix(okxApi): 修正条件单状态判断逻辑

Administrator

4 days ago 5982ab32ef6f4af48426f35e57ccd829fea7bfbf

 src/main/java/com/xcong/excoin/modules/okxApi/OkxGridTradeService.java

@@ -415,13 +415,13 @@
    /**
     * 自动订单状态变更回调。由 OrdersOkxChannelHandler 调用。
     */
    public void onAutoOrder(String orderId, String status, String reason, String orderType, String tradeId) {
    public void onAutoOrder(String orderId, String status, String orderType, String tradeId) {
        if (state == StrategyState.STOPPED) {
            return;
        }
        log.info("[OKX] 条件单状态变更, id:{}, status:{}, reason:{}, order_type:{}",
                orderId, status, reason, orderType);
        if (!"finished".equals(status)) {
        log.info("[OKX] 条件单状态变更, id:{}, status:{}, order_type:{}",
                orderId, status,  orderType);
        if (!"filled".equals(status)) {
            return;
        }

@@ -467,7 +467,8 @@
                int posSize = queryPositionSize(OkxPosMode.SHORT);
                extendShortStopLoss(posSize, shortGridElement.getId());
                accumulatedShortLossCount = 0;
                log.info("[OKX] 空单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
                log.info("[OKX] 空单成交 gridId:{}, 成交{}张, 当前持仓:{}张",
                        shortGridElement.getId(), filledQty, posSize);

                BigDecimal shortBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal shortGridQty = new BigDecimal(config.getQuantity());
@@ -475,8 +476,7 @@
                    BigDecimal shortExcess = BigDecimal.valueOf(posSize).subtract(shortBaseQty);
                    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; }
                        int tpGridId = shortGridElement.getId() - 2 * (i + 1);
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getShortTakeProfitOrderId() != null) {
                            continue;
@@ -507,7 +507,8 @@
                int posSize = queryPositionSize(OkxPosMode.LONG);
                extendLongStopLoss(posSize, longGridElement.getId());
                accumulatedLongLossCount = 0;
                log.info("[OKX] 多单成交 gridId:{}, 当前持仓:{}张", filledQty, posSize);
                log.info("[OKX] 多单成交 gridId:{}, 成交{}张, 当前持仓:{}张",
                        longGridElement.getId(), filledQty, posSize);

                BigDecimal longBaseQty = new BigDecimal(config.getBaseQuantity());
                BigDecimal longGridQty = new BigDecimal(config.getQuantity());
@@ -515,8 +516,7 @@
                    BigDecimal longExcess = BigDecimal.valueOf(posSize).subtract(longBaseQty);
                    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; }
                        int tpGridId = longGridElement.getId() + 2 * (i + 1);
                        GridElement tpElem = GridElement.findById(tpGridId);
                        if (tpElem == null || tpElem.getLongTakeProfitOrderId() != null) {
                            continue;