Administrator
2025-12-15 e61cce89f151c9fc660497135ccbd779c82fe969
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -162,10 +162,18 @@
                AscBigDecimal pingCang = queuePingCang.peek();
                if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
                    log.info("开始减仓...平仓队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
                    // 判断当前是否盈利
                    // 手续费
                    BigDecimal feeValue = PositionsWs.POSITIONSWSMAP.get("fee").multiply(new BigDecimal("2"));
                    // 资金费用
                    BigDecimal fundingFeeValue = PositionsWs.POSITIONSWSMAP.get("fundingFee");
                    //未实现收益
                    BigDecimal uplValue = PositionsWs.POSITIONSWSMAP.get("upl");
                    BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
                    //已实现收益
                    BigDecimal realizedPnlValue = PositionsWs.POSITIONSWSMAP.get("realizedPnl");
                    realizedPnlValue = realizedPnlValue.add(feeValue).add(fundingFeeValue);
                    //持仓保证金
                    BigDecimal imr = PositionsWs.POSITIONSWSMAP.get("imr");
                    String pingCangImr = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.PING_CANG_SHOUYI.name());
                    BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
@@ -238,34 +246,34 @@
        queueKaiCang.removeIf(item -> item.getValue().compareTo(priceDecimal) >= 0);
        // 打印开仓队列
        StringBuilder kaiCangStr = new StringBuilder();
        kaiCangStr.append("开仓队列: [");
        boolean first = true;
        for (DescBigDecimal item : queueKaiCang) {
            if (!first) {
                kaiCangStr.append(", ");
            }
            kaiCangStr.append(item.getValue());
            first = false;
        }
        kaiCangStr.append("]");
        log.info(kaiCangStr.toString());
//        StringBuilder kaiCangStr = new StringBuilder();
//        kaiCangStr.append("开仓队列: [");
//        boolean first = true;
//        for (DescBigDecimal item : queueKaiCang) {
//            if (!first) {
//                kaiCangStr.append(", ");
//            }
//            kaiCangStr.append(item.getValue());
//            first = false;
//        }
//        kaiCangStr.append("]");
//        log.info(kaiCangStr.toString());
        // 删除比该价格小的数据
        queuePingCang.removeIf(item -> item.getValue().compareTo(priceDecimal) <= 0);
        // 打印平仓队列
        StringBuilder pingCangStr = new StringBuilder();
        pingCangStr.append("平仓队列: [");
        first = true;
        for (AscBigDecimal item : queuePingCang) {
            if (!first) {
                pingCangStr.append(", ");
            }
            pingCangStr.append(item.getValue());
            first = false;
        }
        pingCangStr.append("]");
        log.info(pingCangStr.toString());
//        StringBuilder pingCangStr = new StringBuilder();
//        pingCangStr.append("平仓队列: [");
//        first = true;
//        for (AscBigDecimal item : queuePingCang) {
//            if (!first) {
//                pingCangStr.append(", ");
//            }
//            pingCangStr.append(item.getValue());
//            first = false;
//        }
//        pingCangStr.append("]");
//        log.info(pingCangStr.toString());
    }
}