fix(okxWs): 修正订单信息中仓位方向参数传递错误

Administrator

7 days ago b04ced3a372ad561b75066f668abfdae58ca20b3

 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/TradeOrderWs.java

@@ -56,10 +56,6 @@
            log.warn("账户{}不允许下单，取消发送", accountName);
            return;
        }
        if (StrUtil.isEmpty(sz) && BigDecimal.ZERO.compareTo(new BigDecimal(sz)) >= 0) {
            log.warn("下单数量{}不允许下单，取消发送", sz);
            return;
        }
        /**
         * 校验必要参数
         * 验证下单参数是否存在空值
@@ -78,6 +74,10 @@
            log.warn("下单参数缺失，取消发送");
            return;
        }
        if (BigDecimal.ZERO.compareTo(new BigDecimal(sz)) >= 0) {
            log.warn("下单数量{}不允许下单，取消发送", sz);
            return;
        }

        /**
         * 检验账户和仓位是否准备就绪
@@ -86,18 +86,23 @@
         * 平多：卖出平多（side 填写 sell；posSide 填写 long ）
         * 平空：买入平空（side 填写 buy； posSide 填写 short ） 需要检验仓位通道是否准备就绪
         */
        //买入开多、卖出开空则验证仓位通道是否准备就绪

        String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
        BigDecimal positionsReadyState = PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name()) == null
                ? BigDecimal.ZERO : PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name());
        if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
            log.info("仓位{}通道未就绪，取消发送",positionAccountName);
            return;
        }
        String accountReadyState = AccountWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
        if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
            log.info("账户通道未就绪，取消发送");
            return;
        boolean b = posSide.equals(CoinEnums.POSSIDE_LONG.getCode()) && side.equals(CoinEnums.SIDE_BUY.getCode());
        boolean c = posSide.equals(CoinEnums.POSSIDE_SHORT.getCode()) && side.equals(CoinEnums.SIDE_SELL.getCode());
        if ( b || c ){
            BigDecimal positionsReadyState = PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name()) == null
                    ? BigDecimal.ZERO : PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name());
            if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
                log.info("仓位{}通道未就绪，取消发送",positionAccountName);
                return;
            }
            String accountReadyState = AccountWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
            if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
                log.info("账户通道未就绪，取消发送");
                return;
            }
        }

        try {