fix(okxWs): 修复订单信息WebSocket中账户名称初始化参数错误

Administrator

7 days ago 4dbaa914142b578be0756608d3cd23c328c3e4cd

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

@@ -131,7 +131,7 @@
                    WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "state", CoinEnums.ORDER_LIVE.getCode());

                    // 使用账号特定的Map
                    String positionAccountName = PositionsWs.initAccountName(accountName, side);
                    String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
                    Map<String, BigDecimal> positionsMap = PositionsWs.getAccountMap(positionAccountName);
                    WsMapBuild.saveBigDecimalToMap(positionsMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_NO.getCode()));

@@ -139,6 +139,8 @@
                    WsMapBuild.saveStringToMap(accountWsMap, CoinEnums.READY_STATE.name(), CoinEnums.READY_STATE_NO.getCode());

                    log.info("{}: 订单详情已完成: {}, 自定义编号: {}", accountName, CoinEnums.HE_YUE.getCode(), clOrdId);



                    TradeRequestParam tradeRequestParam = new TradeRequestParam();
                    tradeRequestParam.setAccountName(accountName);
@@ -157,7 +159,18 @@
                    tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
                    tradeRequestParam.setPosSide(posSide);
                    tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
                    tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
                    // 获取平均持仓价格
                    // 在获取数据时提供默认值
                    BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
                    log.info("持仓方向{}，当前持仓价格{}，止盈价格{}",posSide,avgPxOld,zhiYingPx);
                    //根据持仓方向，判断是否需要设置限价止盈
                    if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) > 0){
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
                    }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) < 0){
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
                    }else{
                        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(side));
                    tradeRequestParam.setSz(accFillSz);
@@ -171,6 +184,20 @@
        }
        return null;
    }

    public static void main(String[] args) {
        System.out.println(
                getZhiYingPx(
                        "eth",
                        CoinEnums.POSSIDE_LONG.getCode(),
                        "0.0001",
                        new BigDecimal("0.1"),
                        new BigDecimal("0.05"),
                        new BigDecimal("1"),
                        new BigDecimal("2950"),
                        new BigDecimal("100"))
        );
    }
    /**
     * 计算预期收益
     */
@@ -179,7 +206,7 @@
            BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage
    ) {
        BigDecimal initMargin = getInitMargin(coinValue, coinNum, contractMultiplier, avgPx, leverage);
        String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
        String pingCangImr = StrUtil.isEmpty(InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name())) ? "0.2" : InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
        BigDecimal expectProfit = (initMargin).multiply(new BigDecimal(pingCangImr)).add(new BigDecimal(fillFee).abs()).setScale(4, RoundingMode.DOWN);
        log.info("{}: 订单详情-预期收益: {}", accountName, expectProfit);
        return getMarkPrice(expectProfit,posSide, coinValue, coinNum, contractMultiplier, avgPx, leverage);
@@ -191,7 +218,7 @@
     */
    public static BigDecimal getInitMargin(BigDecimal coinValue, BigDecimal coinNum, BigDecimal contractMultiplier, BigDecimal avgPx, BigDecimal leverage) {
        BigDecimal initMargin = coinValue.multiply(coinNum).multiply(contractMultiplier).multiply(avgPx).divide(leverage, 4, RoundingMode.DOWN);
        log.info("{}: 订单详情-初始保证金: {}", initMargin);
        log.info("订单详情-初始保证金: {}", initMargin);
        return initMargin;
    }
    /**