Administrator
2025-12-29 8b4173d1ad4be984992b0ff7b5f04135bc8440c1
feat(okxNewPrice): 实现订单成交后自动触发止盈逻辑

- 修改OrderInfoWs.handleEvent方法返回TradeRequestParam对象
- 在订单详情处理完成后计算止盈价格并封装交易参数
- 新增TradeOrderWs.orderEvent调用实现成交后自动下单功能
- 集成止盈价格计算逻辑支持多账号独立处理
- 完善订单参数构建包括委托类型、仓位方向等关键信息
2 files modified
27 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java 3 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java 24 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxQuantWebSocketClient.java
@@ -383,7 +383,8 @@
        // 注意:当前实现中,OrderInfoWs等类使用静态Map存储数据
        // 这会导致多账号之间的数据冲突。需要进一步修改这些类的设计,让数据存储与特定账号关联
        if (OrderInfoWs.ORDERINFOWS_CHANNEL.equals(channel)) {
            OrderInfoWs.handleEvent(response, redisUtils, account.name());
            TradeRequestParam tradeRequestParam = OrderInfoWs.handleEvent(response, redisUtils, account.name());
            TradeOrderWs.orderEvent(webSocketClient, tradeRequestParam);
        }else if (AccountWs.ACCOUNTWS_CHANNEL.equals(channel)) {
            AccountWs.handleEvent(response, account.name());
        } else if (PositionsWs.POSITIONSWS_CHANNEL.equals(channel)) {
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -115,7 +115,29 @@
                    WsMapBuild.saveStringToMap(accountWsMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());
                    log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);
                    return null;
                    TradeRequestParam tradeRequestParam = new TradeRequestParam();
                    tradeRequestParam.setAccountName(accountName);
                    BigDecimal zhiYingPx = getZhiYingPx(
                            accountName,
                            posSide,
                            fillFee,
                            WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CTVAL.name())),
                            WsMapBuild.parseBigDecimalSafe(accFillSz),
                            WsMapBuild.parseBigDecimalSafe(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.CONTRACTMULTIPLIER.name())),
                            WsMapBuild.parseBigDecimalSafe(avgPx),
                            WsMapBuild.parseBigDecimalSafe(CoinEnums.LEVERAGE.getCode())
                    );
                    tradeRequestParam.setMarkPx(String.valueOf(zhiYingPx));
                    tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
                    tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
                    tradeRequestParam.setPosSide(posSide);
                    tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
                    tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
                    tradeRequestParam.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
                    tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(tradeRequestParam.getSide()));
                    tradeRequestParam.setSz(accFillSz);
                    return tradeRequestParam;
                }
                return null;