fix(okxWs): 调整平仓收益比例值

Administrator

2025-12-20 b6d505eaabf24305b9cb7a0e5ca566aa1654e3b7

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

@@ -104,15 +104,25 @@
                        accFillSz, avgPx,state, fillFee,posSide
                );

                String clOrdIdStr = TradeOrderWs.getAccountMap(accountName).get("clOrdId");

                Map<String, String> accountMap = getAccountMap(accountName);
                String stateStr = TradeOrderWs.getAccountMap(accountName).get("state");
                boolean longSell = CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && CoinEnums.SIDE_SELL.getCode().equals(side);
                boolean shortBuy = CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && CoinEnums.SIDE_BUY.getCode().equals(side);
                if (
                        CoinEnums.ORDER_FILLED.getCode().equals(state)
                            && (longSell || shortBuy)
                ){
                    WsMapBuild.saveStringToMap(accountMap, "orderPrice",avgPx);
                }

                String clOrdIdStr = TradeOrderWs.getAccountMap(accountName).get("clOrdId");
                if (
                        StrUtil.isNotBlank(clOrdIdStr)
                                && clOrdId.equals(clOrdIdStr)
                                && StrUtil.isNotBlank(stateStr)
                                && state.equals(stateStr)
                ){
                    Map<String, String> accountMap = getAccountMap(accountName);
                    //记录成交均价
                    if (accountMap.get("orderPrice") == null){
                        log.info("成交均价: {}", avgPx);
@@ -161,6 +171,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"))
        );
    }
    /**
     * 计算预期收益
     */
@@ -169,7 +193,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);
@@ -181,7 +205,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;
    }
    /**