fix(okxNewPrice): 修复订单事件处理中的数据冲突问题

Administrator

7 days ago 27ebdeb8a61d4af070d2ed52f77c814350b6dc54

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

@@ -1,6 +1,7 @@
package com.xcong.excoin.modules.okxNewPrice.okxWs;

import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
@@ -36,7 +37,7 @@
    public static void orderEvent(WebSocketClient webSocketClient, TradeRequestParam tradeRequestParam) {


        log.info("开始执行TradeOrderWs......");
        log.info("开始执行TradeOrderWs{}......", JSONUtil.parse(tradeRequestParam));
        String accountName = tradeRequestParam.getAccountName();
        String markPx = tradeRequestParam.getMarkPx();
        String instId = tradeRequestParam.getInstId();
@@ -86,18 +87,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 {