Administrator
2025-12-12 976a10e1311226ea9d883e1f672b1d70bbeb1166
fix(okxNewPrice): 优化账户亏损判断逻辑

- 添加对实际亏损金额为正数的前置判断条件
- 调整止损与扛仓逻辑的执行顺序和结构
- 移除冗余空行,提升代码可读性
- 确保只有在真实亏损时才进行后续策略处理
- 维持原有满仓检测逻辑不变
1 files modified
23 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java 23 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -88,16 +88,18 @@
        log.info("预期抗仓金额: {}", kangYaPercent);
        BigDecimal  kangYaAmount = cashBal.multiply(new BigDecimal(kangYaPercent));
        // 账户预期亏损金额比这个还小时,立即止损
        if (realKuiSunAmount.compareTo(zhiSunAmount) > 0){
            log.error("账户冷静止损......");
            WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.OUT.name(),  OrderParamEnums.OUT_YES.getValue());
            return OrderParamEnums.OUT.getValue();
        }
        // 判断抗压
        if (realKuiSunAmount.compareTo(kangYaAmount) > 0 && realKuiSunAmount.compareTo(zhiSunAmount) <= 0){
            log.error("账户紧张扛仓......");
            return OrderParamEnums.HOLDING.getValue();
        if (realKuiSunAmount.compareTo(BigDecimal.ZERO) > 0){
            // 账户预期亏损金额比这个还小时,立即止损
            if (realKuiSunAmount.compareTo(zhiSunAmount) > 0){
                log.error("账户冷静止损......");
                WsMapBuild.saveStringToMap(InstrumentsWs.INSTRUMENTSWSMAP, CoinEnums.OUT.name(),  OrderParamEnums.OUT_YES.getValue());
                return OrderParamEnums.OUT.getValue();
            }
            // 判断抗压
            if (realKuiSunAmount.compareTo(kangYaAmount) > 0 && realKuiSunAmount.compareTo(zhiSunAmount) <= 0){
                log.error("账户紧张扛仓......");
                return OrderParamEnums.HOLDING.getValue();
            }
        }
        BigDecimal ordFroz = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get("ordFroz"));
@@ -106,7 +108,6 @@
            return OrderParamEnums.INIT.getValue();
        }
        // 判断是否保证金超标
        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(CoinEnums.TOTAL_ORDER_USDT.name());
        if (ordFroz.compareTo(totalOrderUsdt) >= 0){
            log.error("已满仓......");