Administrator
2025-12-29 0ee504c3034ff02ec28a6212b32a536ecbbfdcb1
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java
@@ -74,6 +74,10 @@
            log.warn("下单参数缺失,取消发送");
            return;
        }
        if (BigDecimal.ZERO.compareTo(new BigDecimal(sz)) >= 0) {
            log.warn("下单数量{}不允许下单,取消发送", sz);
            return;
        }
        /**
         * 检验账户和仓位是否准备就绪
@@ -114,7 +118,6 @@
            webSocketClient.send(jsonObject.toJSONString());
            log.info("发送下单频道:{},数量:{}", side, sz);
            WsMapBuild.saveStringToMap(getAccountMap(accountName), "clOrdId", clOrdId);
            WsMapBuild.saveStringToMap(getAccountMap(accountName), "state", CoinEnums.ORDER_FILLED.getCode());
            /**
             * 将状态更新为未准备就绪
@@ -127,10 +130,15 @@
        }
    }
    public static void orderZhiYingEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
    public static void orderZhiYingZhiSunEventNoState(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {
        log.info("开始执行TradeOrderWs......");
        if (tradeRequestParam == null){
            log.warn("下单{}参数缺失,取消发送",tradeRequestParam);
            return;
        }
        String accountName = tradeRequestParam.getAccountName();
        String markPx = tradeRequestParam.getMarkPx();
        String instId = tradeRequestParam.getInstId();
@@ -143,13 +151,6 @@
        String clOrdId = tradeRequestParam.getClOrdId();
        String side = tradeRequestParam.getSide();
        String sz = tradeRequestParam.getSz();
        log.info("账户:{},触发价格:{},币种:{},方向:{},买卖:{},数量:{},是否允许下单:{},编号:{},",
                accountName, markPx, instId, posSide,side,  sz, tradeType, clOrdId);
        //验证是否允许下单
        if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
            log.warn("账户{}不允许下单,取消发送", accountName);
            return;
        }
        /**
         * 校验必要参数
         * 验证下单参数是否存在空值
@@ -169,6 +170,13 @@
            log.warn("下单参数缺失,取消发送");
            return;
        }
        log.info("账户:{},触发价格:{},币种:{},方向:{},买卖:{},数量:{},是否允许下单:{},编号:{},",
                accountName, markPx, instId, posSide,side,  sz, tradeType, clOrdId);
        //验证是否允许下单
        if (StrUtil.isNotEmpty(tradeType) && OrderParamEnums.TRADE_NO.getValue().equals(tradeType)) {
            log.warn("账户{}不允许下单,取消发送", accountName);
            return;
        }
        /**
         * 检验账户和仓位是否准备就绪