fix(okxNewPrice): 修复仓位收益计算逻辑

Administrator

2025-12-10 462c81a04e9694cde8d465c3b1fc7a18b390a337

 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java

@@ -37,6 +37,7 @@
    // 构造Redis键名
    final String coinCode = CoinEnums.HE_YUE.getCode();
    final String instrumentsStateKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + coinCode + ":state";
    final String instrumentsOutKey = InstrumentsWs.INSTRUMENTSWS_CHANNEL+":" + coinCode+":out";
    final String positionsMarkPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":markPx";
    final String positionsAvgPxKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":avgPx";
    final String positionsOrderPriceKey = PositionsWs.POSITIONSWS_CHANNEL + ":" + coinCode + ":orderPrice";
@@ -53,11 +54,11 @@
     */
    @Override
    public String caoZuo() {
        log.info("开始执行操作......");
        String pos = (String) redisUtils.get(positionsPosKey);
        if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) <= 0) {
            log.error("未获取到持仓数量");
            return OrderParamEnums.INIT.getValue();
        log.info("开始执行操作CaoZuoServiceImpl......");
        String outStr = (String) redisUtils.get(instrumentsOutKey);
        if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
            log.error("止损过了......冷静一下，等待下次入场......");
            return null;
        }

        // 获取合约执行操作状态
@@ -67,7 +68,8 @@
            return OrderParamEnums.ORDERING.getValue();
        }
        if (OrderParamEnums.STATE_3.getValue().equals(state)){
            log.error("持仓盈亏超过下单总保证金，止损冷静一天......");
            log.error("持仓盈亏超过下单总保证金，冷静止损......");
            redisUtils.set(instrumentsOutKey, OrderParamEnums.OUT_YES.getValue(), 0);
            return OrderParamEnums.OUT.getValue();
        }
        if (OrderParamEnums.STATE_2.getValue().equals(state)){
@@ -77,6 +79,12 @@
        if (OrderParamEnums.STATE_0.getValue().equals(state)){
            log.error("请检查系统参数，不允许开仓......");
            return OrderParamEnums.HOLDING.getValue();
        }

        String pos = (String) redisUtils.get(positionsPosKey);
        if (StrUtil.isBlank(pos) || BigDecimal.ZERO.compareTo( new BigDecimal(pos)) >= 0) {
            log.error("未获取到持仓数量");
            return OrderParamEnums.INIT.getValue();
        }

        String uplStr = (String) redisUtils.get(positionsUplKey);
@@ -137,6 +145,13 @@
                    side = OrderParamEnums.BUY.getValue();
                    redisUtils.set(positionsOrderPriceKey, String.valueOf(kaiCang.getValue()), 0);
                } else {
                    //判断是否加仓（当前持仓过小，可以加仓）
                    boolean isAddCang = doAddCang();
                    log.info("加仓过程中发现持仓过小 ：{}",isAddCang);
                    if (isAddCang){
                        log.info("触发加仓......，持仓过小");
                        return OrderParamEnums.BUY.getValue();
                    }
                    log.info("未触发加仓......，等待");
                }
            } else if (avgPx.compareTo(markPx) < 0) {
@@ -164,6 +179,13 @@
                                redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                return OrderParamEnums.SELL.getValue();
                            }else{
                                //判断是否加仓（当前持仓过小，可以加仓）
                                boolean isAddCang = doAddCang();
                                log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
                                if (isAddCang){
                                    log.info("触发加仓......，持仓过小");
                                    return OrderParamEnums.BUY.getValue();
                                }
                                log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                                redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                return OrderParamEnums.HOLDING.getValue();
@@ -175,6 +197,13 @@
                                redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                return OrderParamEnums.SELL.getValue();
                            }else{
                                //判断是否加仓（当前持仓过小，可以加仓）
                                boolean isAddCang = doAddCang();
                                log.info("减仓过程中发现持仓过小 ：{}",isAddCang);
                                if (isAddCang){
                                    log.info("触发加仓......，持仓过小");
                                    return OrderParamEnums.BUY.getValue();
                                }
                                log.info("当前未实现盈亏：{}没有大于预计收益>{}，钱在路上了", uplValue, imrValue);
                                redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                return OrderParamEnums.HOLDING.getValue();
@@ -195,6 +224,14 @@
            log.error("解析价格失败，请检查Redis中的值是否合法", e);
            return OrderParamEnums.HOLDING.getValue();
        }
    }

    private boolean doAddCang() {
        String imr = (String) redisUtils.get(positionsImrKey);
        BigDecimal imrValue = new BigDecimal(StrUtil.isBlank(imr) ? "0" : imr);
        String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
        BigDecimal everyTimeUsdtValue = new BigDecimal(everyTimeUsdt);
        return everyTimeUsdtValue.compareTo(imrValue) >= 0;
    }

    /**
@@ -220,8 +257,8 @@
            log.warn("无效的价格格式: {}", orderPrice);
            return;
        }
        // 删除比该价格大的数据（由于是降序队列，所以是删除value.compareTo(priceDecimal) < 0的元素）
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
        // 删除比该价格大的数据
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
        // 打印开仓队列
        StringBuilder kaiCangStr = new StringBuilder();
        kaiCangStr.append("开仓队列: [");
@@ -236,8 +273,8 @@
        kaiCangStr.append("]");
        log.info(kaiCangStr.toString());

        // 删除比该价格小的数据（由于是升序队列，所以是删除value.compareTo(priceDecimal) > 0的元素）
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
        // 删除比该价格小的数据
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);

        // 打印平仓队列
        StringBuilder pingCangStr = new StringBuilder();