From 1fefaefc56960c2900f40084aab2d501c1c1eddf Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 10 Dec 2025 14:23:38 +0800
Subject: [PATCH] feat(okxNewPrice): 实现加仓逻辑以优化持仓管理

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java b/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
index d1cc961..ea2f2bb 100644
--- a/src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
+++ b/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";
@@ -54,6 +55,11 @@
     @Override
     public String caoZuo() {
         log.info("开始执行操作CaoZuoServiceImpl......");
+        String outStr = (String) redisUtils.get(instrumentsOutKey);
+        if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
+            log.error("止损过了......冷静一下,等待下次入场......");
+            return null;
+        }
 
         // 获取合约执行操作状态
         String state = (String) redisUtils.get(instrumentsStateKey);
@@ -62,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)){
@@ -165,6 +172,12 @@
                                 redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                 return OrderParamEnums.SELL.getValue();
                             }else{
+                                //判断是否加仓(当前持仓过小,可以加仓)
+                                boolean isAddCang = doAddCang(imrValue);
+                                log.info("减仓过程中没有收获,发现是持仓过小 :{}",isAddCang);
+                                if (isAddCang){
+                                    return OrderParamEnums.BUY.getValue();
+                                }
                                 log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);
                                 redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                 return OrderParamEnums.HOLDING.getValue();
@@ -176,6 +189,13 @@
                                 redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                 return OrderParamEnums.SELL.getValue();
                             }else{
+
+                                //判断是否加仓(当前持仓过小,可以加仓)
+                                boolean isAddCang = doAddCang(imrValue);
+                                log.info("减仓过程中没有收获,发现是持仓过小 :{}",isAddCang);
+                                if (isAddCang){
+                                    return OrderParamEnums.BUY.getValue();
+                                }
                                 log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue);
                                 redisUtils.set(positionsOrderPriceKey, String.valueOf(pingCang.getValue()), 0);
                                 return OrderParamEnums.HOLDING.getValue();
@@ -198,6 +218,12 @@
         }
     }
 
+    private boolean doAddCang(BigDecimal imrValue) {
+        String everyTimeUsdt = (String) redisUtils.get(AccountWs.ACCOUNTWS_CHANNEL + ":" + CoinEnums.USDT.getCode() + ":everyTimeUsdt");
+        BigDecimal everyTimeUsdtValue = new BigDecimal(everyTimeUsdt);
+        return everyTimeUsdtValue.compareTo(imrValue) >= 0;
+    }
+
     /**
      * 根据订单价格更新开仓和平仓队列的内容。
      * 若该价格不在对应队列中则加入;若已存在,则从队列中移除。

--
Gitblit v1.9.1