From 5535ce6b90bdf8e88a1e4b36b097635737daeeac Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Fri, 19 Dec 2025 11:48:20 +0800
Subject: [PATCH] fix(okxNewPrice): 修正加仓操作的交易方向

---
 src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java |  608 +++++++++++++++++++++++++++++++-----------------------
 1 files changed, 345 insertions(+), 263 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 bf8b556..1c0747e 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
@@ -5,12 +5,12 @@
 import com.xcong.excoin.modules.okxNewPrice.okxWs.*;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.OrderParamEnums;
+import com.xcong.excoin.modules.okxNewPrice.okxWs.param.TradeRequestParam;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListEnum;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListQueue;
 import com.xcong.excoin.modules.okxNewPrice.okxWs.wanggeList.WangGeListService;
 import com.xcong.excoin.modules.okxNewPrice.utils.WsMapBuild;
-import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeQueue;
-import com.xcong.excoin.modules.okxNewPrice.wangge.WangGeService;
+import com.xcong.excoin.modules.okxNewPrice.utils.WsParamBuild;
 import com.xcong.excoin.rabbit.pricequeue.AscBigDecimal;
 import com.xcong.excoin.rabbit.pricequeue.DescBigDecimal;
 import com.xcong.excoin.utils.RedisUtils;
@@ -34,7 +34,6 @@
 @RequiredArgsConstructor
 public class CaoZuoServiceImpl implements CaoZuoService {
 
-    private final WangGeService wangGeService;
     private final WangGeListService wangGeListService;
     private final RedisUtils redisUtils;
 
@@ -45,62 +44,33 @@
      * @return 返回操作类型字符串(如买入BUY、卖出SELL等),如果无有效操作则返回null
      */
     @Override
-    public String caoZuo(String accountName) {
-        String accountReadyState = AccountWs.getAccountMap(accountName).get(CoinEnums.READY_STATE.name());
-        if (!CoinEnums.READY_STATE_YES.getCode().equals(accountReadyState)) {
-            log.info("账户通道未就绪,取消发送");
-            return null;
-        }
-        String markPx = ObjectUtil.isEmpty(redisUtils.getString(CoinEnums.HE_YUE.getCode())) ? "0" : redisUtils.getString(CoinEnums.HE_YUE.getCode());
-        log.info("当前价格: {}", markPx);
-        WangGeListEnum gridByPrice = WangGeListEnum.getGridByPrice(new BigDecimal(markPx));
-        if (gridByPrice == null){
-            log.error("没有获取到网格参数......");
-            return null;
-        }
-        log.info("当前网格: {}", gridByPrice.name());
-        Map<String, String> accountMap = InstrumentsWs.getAccountMap(accountName);
-        String wanggeName = accountMap.get(CoinEnums.WANG_GE_OLD.name());
+    public TradeRequestParam caoZuoHandler(String accountName, String markPx, String posSide) {
+        TradeRequestParam tradeRequestParam = new TradeRequestParam();
+        tradeRequestParam.setAccountName(accountName);
+        tradeRequestParam.setMarkPx(markPx);
+        tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
+        tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
+        tradeRequestParam.setPosSide(posSide);
+        tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
+
+        log.info("操作账户:{},当前价格: {},仓位方向: {}", accountName,markPx,posSide);
         /**
-         * 如果下单的网格不属于同一个网格,则先止损掉老的网格的仓位
+         * 准备工作
+         * 1、准备好下单的基本信息
          */
-        if (StrUtil.isNotEmpty(wanggeName) && !wanggeName.equals(gridByPrice.name())){
-            log.error("正在止损老的网格仓位......");
-            WangGeListEnum oldWangge = WangGeListEnum.getByName(wanggeName);
-            if (oldWangge != null){
-                WsMapBuild.saveStringToMap(accountMap, CoinEnums.POSSIDE.name(), oldWangge.getFang_xiang());
-                return OrderParamEnums.OUT.getValue();
-            }
-        }
-        String posSide = gridByPrice.getFang_xiang();
-        log.info("仓位方向: {}", posSide);
-        WsMapBuild.saveStringToMap(accountMap, CoinEnums.POSSIDE.name(), posSide);
-        String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
-        BigDecimal positionsReadyState = PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name()) == null
-                ? BigDecimal.ZERO : PositionsWs.getAccountMap(positionAccountName).get(CoinEnums.READY_STATE.name());
-        if (WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()).compareTo(positionsReadyState) != 0) {
-            log.info("仓位{}通道未就绪,取消发送",positionAccountName);
-            return null;
-        }
         // 系统设置的开关,等于冷静中,则代表不开仓
         String outStr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.OUT.name());
         if (OrderParamEnums.OUT_YES.getValue().equals(outStr)){
             log.error("冷静中,不允许下单......");
-            return null;
+            tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+            return chooseEvent(tradeRequestParam);
         }
         BigDecimal cashBal = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get("cashBal"));
-
-        // 判断账户余额是否充足
-        if (cashBal.compareTo(BigDecimal.ZERO) <= 0){
-            log.error("账户没有钱,请充值......");
-            return null;
-        }
         /**
          * 判断止损抗压
          */
-        // 实际亏损金额
         BigDecimal realKuiSunAmount = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get("upl"));
-        log.info("未实现盈亏: {}", realKuiSunAmount);
+        log.info("实际盈亏金额: {}", realKuiSunAmount);
         String zhiSunPercent = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.ZHI_SUN.name());
         BigDecimal zhiSunAmount = cashBal.multiply(new BigDecimal(zhiSunPercent));
         log.info("预期亏损金额: {}", zhiSunAmount);
@@ -114,61 +84,268 @@
             if (realKuiSunAmount.compareTo(zhiSunAmount) > 0){
                 log.error("账户冷静止损......");
                 WsMapBuild.saveStringToMap(InstrumentsWs.getAccountMap(accountName), CoinEnums.OUT.name(),  OrderParamEnums.OUT_YES.getValue());
-                return OrderParamEnums.OUT.getValue();
+                tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+                return caoZuoZhiSunEvent(accountName, markPx, posSide);
             }
             // 判断抗压
             if (realKuiSunAmount.compareTo(kangYaAmount) > 0 && realKuiSunAmount.compareTo(zhiSunAmount) <= 0){
                 log.error("账户紧张扛仓......");
-                return OrderParamEnums.HOLDING.getValue();
+                tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+                return chooseEvent(tradeRequestParam);
             }
+        }
+
+        String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
+        // 判断是否保证金超标
+        if (PositionsWs.getAccountMap(positionAccountName).get("imr") == null){
+            log.error("没有获取到持仓信息,等待初始化......");
+            tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+            return chooseEvent(tradeRequestParam);
+        }
+        BigDecimal ordFrozImr = PositionsWs.getAccountMap(positionAccountName).get("imr");
+        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()))
+                .divide(new BigDecimal("2"), RoundingMode.DOWN);
+        if (ordFrozImr.compareTo(totalOrderUsdt) >= 0){
+            log.error("已满仓......");
+            tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+            return chooseEvent(tradeRequestParam);
         }
 
         if (PositionsWs.getAccountMap(positionAccountName).get("pos") == null){
             log.error("没有获取到持仓信息,等待初始化......");
-            return null;
+            tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+            return chooseEvent(tradeRequestParam);
         }
         BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
         if (BigDecimal.ZERO.compareTo( pos) >= 0) {
             log.error("持仓数量为零,进行初始化订单");
-            return null;
-        }
-        // 判断是否保证金超标
-        if (PositionsWs.getAccountMap(positionAccountName).get("imr") == null){
-            log.error("没有获取到持仓信息,等待初始化......");
-            return null;
-        }
-        BigDecimal ordFrozImr = PositionsWs.getAccountMap(positionAccountName).get("imr");
-        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()));
-        if (ordFrozImr.compareTo(totalOrderUsdt) >= 0){
-            log.error("已满仓......");
-            return OrderParamEnums.HOLDING.getValue();
+            return caoZuoInitEvent(accountName, markPx, posSide);
         }
 
-        PriorityBlockingQueue<AscBigDecimal> ascBigDecimals = wangGeListService.initWangGe(markPx);
-        if (ascBigDecimals == null){
-            log.error("没有获取到网格队列......");
-            return null;
-        }
+        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+        return chooseEvent(tradeRequestParam);
+    }
+
+    @Override
+    public TradeRequestParam caoZuoZhiSunEvent(String accountName, String markPx, String posSide) {
+
+        log.info("历史网格:操作账户:{},当前价格: {},仓位方向: {}", accountName,markPx,posSide);
+        /**
+         * 初始化订单请求参数
+         *      获取仓位数量
+         *      获取仓位方向
+         */
+        TradeRequestParam tradeRequestParam = new TradeRequestParam();
+        tradeRequestParam.setAccountName(accountName);
+        tradeRequestParam.setMarkPx(markPx);
+        tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
+        tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
+        tradeRequestParam.setPosSide(posSide);
+        tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
+
+        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+        String side = null;
         if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide)){
-            return caoZuoLong(accountName);
-        }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
-            return caoZuoShort(accountName);
-        }else{
-            log.error("账户未设置持仓方向......");
-            return null;
+            side = CoinEnums.SIDE_SELL.getCode();
+        }
+        if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
+            side = CoinEnums.SIDE_BUY.getCode();
+        }
+        tradeRequestParam.setSide(side);
+
+        String clOrdId = WsParamBuild.getOrderNum(side);
+        tradeRequestParam.setClOrdId(clOrdId);
+
+        String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
+        BigDecimal pos = PositionsWs.getAccountMap(positionAccountName).get("pos");
+        if (BigDecimal.ZERO.compareTo( pos) >= 0) {
+            log.error("历史网格止损方向没有持仓");
+            tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
+        }
+        tradeRequestParam.setSz(String.valueOf( pos));
+        return tradeRequestParam;
+
+    }
+
+    @Override
+    public TradeRequestParam caoZuoInitEvent(String accountName, String markPx, String posSide) {
+
+        log.info("当前网格初始化:操作账户:{},当前价格: {},仓位方向: {}", accountName,markPx,posSide);
+        /**
+         * 初始化订单请求参数
+         *      获取仓位数量
+         *      获取仓位方向
+         */
+        TradeRequestParam tradeRequestParam = new TradeRequestParam();
+        tradeRequestParam.setAccountName(accountName);
+        tradeRequestParam.setMarkPx(markPx);
+        tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
+        tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
+        tradeRequestParam.setPosSide(posSide);
+        tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
+
+        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
+        String side = null;
+        if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide)){
+            side = CoinEnums.SIDE_BUY.getCode();
+        }
+        if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
+            side = CoinEnums.SIDE_SELL.getCode();
+        }
+        tradeRequestParam.setSide(side);
+
+        String clOrdId = WsParamBuild.getOrderNum(side);
+        tradeRequestParam.setClOrdId(clOrdId);
+        String sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+        tradeRequestParam.setSz(sz);
+        return tradeRequestParam;
+    }
+
+    @Override
+    public TradeRequestParam chooseEvent(TradeRequestParam tradeRequestParam) {
+        log.info("开始执行chooseEvent......");
+        if (OrderParamEnums.TRADE_NO.getValue().equals(tradeRequestParam.getTradeType())){
+            return tradeRequestParam;
+        }
+        if (OrderParamEnums.TRADE_YES.getValue().equals(tradeRequestParam.getTradeType())){
+            String posSide = tradeRequestParam.getPosSide();
+            if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide)){
+                tradeRequestParam = caoZuoLong(tradeRequestParam);
+            }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide)){
+                tradeRequestParam = caoZuoShort(tradeRequestParam);
+            }
+        }
+        return tradeRequestParam;
+    }
+
+    @Override
+    public TradeRequestParam caoZuoLong(TradeRequestParam tradeRequestParam) {
+        log.info("开始做{}执行操作CaoZuoServiceImpl......",tradeRequestParam.getPosSide());
+
+        String accountName = tradeRequestParam.getAccountName();
+        String markPxStr = tradeRequestParam.getMarkPx();
+        String posSide = tradeRequestParam.getPosSide();
+
+        try {
+
+            String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
+            // 获取标记价格和平均持仓价格
+            BigDecimal markPx = new BigDecimal(markPxStr);
+            BigDecimal avgPx = PositionsWs.getAccountMap(positionAccountName).get("avgPx");
+            log.info("持仓价格: {}, 当前价格:{},匹配队列中......", avgPx, markPx);
+            // 初始化网格队列
+            PriorityBlockingQueue<AscBigDecimal> queueAsc = WangGeListQueue.getQueueAsc();
+            PriorityBlockingQueue<DescBigDecimal> queueKaiCang = wangGeListService.initKaiCang(avgPx, queueAsc);
+            PriorityBlockingQueue<AscBigDecimal> queuePingCang = wangGeListService.initPingCang(avgPx, queueAsc);
+
+            // 处理订单价格在队列中的情况
+            String orderPrice = OrderInfoWs.getAccountMap(accountName).get("orderPrice");
+            log.info("上一次网格触发价格: {}", orderPrice);
+            handleOrderPriceInQueues(orderPrice, queueKaiCang, queuePingCang);
+            // 判断是加仓还是减仓
+            if (avgPx.compareTo(markPx) > 0) {
+                log.info("开始买入开多...");
+                if (!queueKaiCang.isEmpty()) {
+                    DescBigDecimal kaiCang = queueKaiCang.peek();
+                    log.info("买入开多队列价格{}", kaiCang.getValue());
+                    if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
+                        log.info("开始买入开多...买入开多队列价格价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
+                        WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                        String side = CoinEnums.SIDE_BUY.getCode();
+                        tradeRequestParam.setSide(side);
+                        String clOrdId = WsParamBuild.getOrderNum(side);
+                        tradeRequestParam.setClOrdId(clOrdId);
+                        String sz = buyCntTimeLongEvent(accountName, avgPx, markPx);
+                        tradeRequestParam.setSz(sz);
+                        log.info("买入开多参数准备成功......");
+                    } else {
+                        log.info("未触发加仓......,等待");
+                    }
+                }else{
+                    // 队列为空
+                    log.info("超出了网格设置...");
+                }
+            } else if (avgPx.compareTo(markPx) < 0) {
+                log.info("开始卖出平多...");
+                if (!queuePingCang.isEmpty()) {
+                    AscBigDecimal pingCang = queuePingCang.peek();
+                    log.info("卖出平多队列价格:{}", pingCang.getValue());
+                    if (pingCang != null && avgPx.compareTo(pingCang.getValue()) < 0) {
+                        log.info("开始卖出平多...卖出平多队列价格大于开仓价格{}>{}", pingCang.getValue(), avgPx);
+                        // 手续费
+                        BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee");
+                        //未实现收益
+                        BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
+                        //已实现收益
+                        BigDecimal realizedPnlValue = PositionsWs.getAccountMap(positionAccountName).get("realizedPnl");
+                        realizedPnlValue = realizedPnlValue.add(feeValue);
+
+                        //持仓保证金
+                        BigDecimal imr = PositionsWs.getAccountMap(positionAccountName).get("imr");
+                        String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
+                        BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
+
+                        if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
+                            BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
+                            if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng))  >= 0) {
+                                log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(realizedPnlValueZheng));
+                                WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                                String side = CoinEnums.SIDE_SELL.getCode();
+                                tradeRequestParam.setSide(side);
+                                String clOrdId = WsParamBuild.getOrderNum(side);
+                                tradeRequestParam.setClOrdId(clOrdId);
+                                BigDecimal sz = PositionsWs.getAccountMap(positionAccountName).get("pos");
+                                tradeRequestParam.setSz(String.valueOf( sz));
+                                log.info("卖出平多参数准备成功......");
+                            }else{
+                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(realizedPnlValueZheng));
+                            }
+                        }else {
+                            if (uplValue.compareTo(imrValue.add(feeValue))  >= 0) {
+                                log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(feeValue));
+                                WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                                String side = CoinEnums.SIDE_SELL.getCode();
+                                tradeRequestParam.setSide(side);
+                                String clOrdId = WsParamBuild.getOrderNum(side);
+                                tradeRequestParam.setClOrdId(clOrdId);
+                                BigDecimal sz = PositionsWs.getAccountMap(positionAccountName).get("pos");
+                                tradeRequestParam.setSz(String.valueOf( sz));
+                                log.info("卖出平多参数准备成功......");
+                            }else{
+                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(feeValue));
+                            }
+                        }
+                    } else {
+                        log.info("未触发减仓......,等待");
+                    }
+                }else{
+                    // 队列为空
+                    log.info("超出了网格设置...");
+                }
+            } else {
+                log.info("价格波动较小......,等待");
+            }
+            return tradeRequestParam;
+        } catch (NumberFormatException e) {
+            log.error("开多方向异常", e);
+            return tradeRequestParam;
         }
     }
 
     @Override
-    public String caoZuoLong(String accountName) {
-        log.info("开始看涨执行操作CaoZuoServiceImpl......");
-        try {
+    public TradeRequestParam caoZuoShort(TradeRequestParam tradeRequestParam) {
+        log.info("开始做{}执行操作CaoZuoServiceImpl......",tradeRequestParam.getPosSide());
 
-            String positionAccountName = PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode());
+        String accountName = tradeRequestParam.getAccountName();
+        String markPxStr = tradeRequestParam.getMarkPx();
+        String posSide = tradeRequestParam.getPosSide();
+
+        try {
+            String positionAccountName = PositionsWs.initAccountName(accountName, posSide);
             // 获取标记价格和平均持仓价格
-            BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
+            BigDecimal markPx = new BigDecimal(markPxStr);
             BigDecimal avgPx = PositionsWs.getAccountMap(positionAccountName).get("avgPx");
-            log.info("开仓价格: {}, 当前价格:{},匹配队列中......", avgPx, markPx);
+            log.info("持仓价格: {}, 当前价格:{},匹配队列中......", avgPx, markPx);
 
             // 初始化网格队列
             PriorityBlockingQueue<AscBigDecimal> queueAsc = WangGeListQueue.getQueueAsc();
@@ -177,216 +354,121 @@
 
             // 处理订单价格在队列中的情况
             String orderPrice = OrderInfoWs.getAccountMap(accountName).get("orderPrice");
-            log.info("订单价格: {}", orderPrice);
+            log.info("上一次网格触发价格:{}", orderPrice);
             handleOrderPriceInQueues(orderPrice, queueKaiCang, queuePingCang);
             // 判断是加仓还是减仓
             if (avgPx.compareTo(markPx) > 0) {
-                log.info("开始加仓...");
-                if (queueKaiCang.isEmpty()) {
-                    // 队列为空
-//                    log.info("开始加仓,但是超出了网格设置...");
-                    return OrderParamEnums.HOLDING.getValue();
-                }
-                DescBigDecimal kaiCang = queueKaiCang.peek();
-                log.info("下限队列价格{}", kaiCang);
-                if (kaiCang != null && markPx.compareTo(kaiCang.getValue()) <= 0 && avgPx.compareTo(kaiCang.getValue()) >= 0) {
-                    log.info("开始加仓...下限队列价格大于当前价格{}>{}", kaiCang.getValue(), markPx);
-                    WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                    boolean buyCntTimeFlag = buyCntTimeLongEvent(accountName, avgPx, markPx);
-                    if (buyCntTimeFlag){
-                        log.info("加仓参数准备成功......");
-                        return OrderParamEnums.BUY.getValue();
-                    }else{
-                        log.error("加仓参数准备失败......");
-                        return null;
+                log.info("开始买入平空...");
+                if (!queueKaiCang.isEmpty()) {
+                    DescBigDecimal kaiCang = queueKaiCang.peek();
+                    log.info("买入平空队列价格{}", kaiCang.getValue());
+                    if (kaiCang != null && avgPx.compareTo(kaiCang.getValue()) >= 0) {
+                        log.info("开始买入平空...买入平空队列价格小于开仓价格{}<{}", kaiCang.getValue(), avgPx);
+
+                        // 手续费
+                        BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee");
+                        //未实现收益
+                        BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
+                        //已实现收益
+                        BigDecimal realizedPnlValue = PositionsWs.getAccountMap(positionAccountName).get("realizedPnl");
+                        realizedPnlValue = realizedPnlValue.add(feeValue);
+
+                        //持仓保证金
+                        BigDecimal imr = PositionsWs.getAccountMap(positionAccountName).get("imr");
+                        String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
+                        BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
+
+                        if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
+                            BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
+                            if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng))  >= 0) {
+                                log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(realizedPnlValueZheng));
+                                WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                                String side = CoinEnums.SIDE_BUY.getCode();
+                                tradeRequestParam.setSide(side);
+                                String clOrdId = WsParamBuild.getOrderNum(side);
+                                tradeRequestParam.setClOrdId(clOrdId);
+                                BigDecimal sz = PositionsWs.getAccountMap(positionAccountName).get("pos");
+                                tradeRequestParam.setSz(String.valueOf( sz));
+                                log.info("买入平空参数准备成功......");
+                            }else{
+                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(realizedPnlValueZheng));
+                            }
+                        }else {
+                            if (uplValue.compareTo(imrValue.add(feeValue))  >= 0) {
+                                WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                                log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(feeValue));
+                                String side = CoinEnums.SIDE_BUY.getCode();
+                                tradeRequestParam.setSide(side);
+                                String clOrdId = WsParamBuild.getOrderNum(side);
+                                tradeRequestParam.setClOrdId(clOrdId);
+                                BigDecimal sz = PositionsWs.getAccountMap(positionAccountName).get("pos");
+                                tradeRequestParam.setSz(String.valueOf( sz));
+                                log.info("买入平空参数准备成功......");
+                            }else{
+                                log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(feeValue));
+                            }
+                        }
+                    } else {
+                        log.info("未触发减仓......,等待");
                     }
-                } else {
-                    log.info("未触发加仓......,等待");
-                    return OrderParamEnums.HOLDING.getValue();
-                }
-            } else if (avgPx.compareTo(markPx) < 0) {
-                log.info("开始减仓...");
-                if (queuePingCang.isEmpty()) {
-                    // 队列为空
+                }else{
                     log.info("开始减仓,但是超出了网格设置...");
-                    return OrderParamEnums.HOLDING.getValue();
-                }
-                AscBigDecimal pingCang = queuePingCang.peek();
-                log.info("上限队列价格:{}", pingCang.getValue());
-                if (pingCang != null && avgPx.compareTo(pingCang.getValue()) < 0) {
-                    log.info("开始减仓...上限队列价格大于开仓价格{}>{}", pingCang.getValue(), avgPx);
-                    // 手续费
-                    BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
-                    //未实现收益
-                    BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
-                    //已实现收益
-                    BigDecimal realizedPnlValue = PositionsWs.getAccountMap(positionAccountName).get("realizedPnl");
-                    realizedPnlValue = realizedPnlValue.add(feeValue);
-
-                    //持仓保证金
-                    BigDecimal imr = PositionsWs.getAccountMap(positionAccountName).get("imr");
-                    String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
-                    BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
-
-                    if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
-                        BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
-                        if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng))  >= 0) {
-                            log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(realizedPnlValueZheng));
-                            WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                            return OrderParamEnums.SELL.getValue();
-                        }else{
-                            log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(realizedPnlValueZheng));
-                            return OrderParamEnums.HOLDING.getValue();
-                        }
-                    }else {
-                        if (uplValue.compareTo(imrValue.add(feeValue))  >= 0) {
-                            WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                            log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(feeValue));
-                            return OrderParamEnums.SELL.getValue();
-                        }else{
-                            log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(feeValue));
-                            return OrderParamEnums.HOLDING.getValue();
-                        }
-                    }
-                } else {
-                    log.info("未触发减仓......,等待");
-                }
-            } else {
-                log.info("价格波动较小......,等待");
-            }
-            return null;
-        } catch (NumberFormatException e) {
-            log.error("解析价格失败,请检查Redis中的值是否合法", e);
-            return null;
-        }
-    }
-
-    @Override
-    public String caoZuoShort(String accountName) {
-        log.info("开始看空执行操作CaoZuoServiceImpl......");
-        try {
-
-
-            String positionAccountName = PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_SHORT.getCode());
-            // 获取标记价格和平均持仓价格
-            BigDecimal markPx = PositionsWs.getAccountMap(positionAccountName).get("markPx");
-            BigDecimal avgPx = PositionsWs.getAccountMap(positionAccountName).get("avgPx");
-            log.info("开仓价格: {}, 当前价格:{},匹配队列中......", avgPx, markPx);
-
-            // 初始化网格队列
-            PriorityBlockingQueue<AscBigDecimal> queueAsc = WangGeListQueue.getQueueAsc();
-            PriorityBlockingQueue<DescBigDecimal> queueKaiCang = wangGeListService.initKaiCang(avgPx, queueAsc);
-            PriorityBlockingQueue<AscBigDecimal> queuePingCang = wangGeListService.initPingCang(avgPx, queueAsc);
-
-            // 处理订单价格在队列中的情况
-            String orderPrice = OrderInfoWs.getAccountMap(accountName).get("orderPrice");
-            log.info("订单价格:{}", orderPrice);
-            handleOrderPriceInQueues(orderPrice, queueKaiCang, queuePingCang);
-            // 判断是加仓还是减仓
-            if (avgPx.compareTo(markPx) > 0) {
-                log.info("开始减仓...");
-                if (queueKaiCang.isEmpty()) {
-                    // 队列为空
-//                    log.info("开始加仓,但是超出了网格设置...");
-                    return OrderParamEnums.HOLDING.getValue();
-                }
-                DescBigDecimal kaiCang = queueKaiCang.peek();
-                log.info("下限队列价格{}", kaiCang);
-                if (kaiCang != null && avgPx.compareTo(kaiCang.getValue()) >= 0) {
-                    log.info("开始减仓...下限队列价格小于开仓价格{}<{}", kaiCang.getValue(), avgPx);
-
-                    // 手续费
-                    BigDecimal feeValue = PositionsWs.getAccountMap(positionAccountName).get("fee").multiply(new BigDecimal("2"));
-                    //未实现收益
-                    BigDecimal uplValue = PositionsWs.getAccountMap(positionAccountName).get("upl");
-                    //已实现收益
-                    BigDecimal realizedPnlValue = PositionsWs.getAccountMap(positionAccountName).get("realizedPnl");
-                    realizedPnlValue = realizedPnlValue.add(feeValue);
-
-                    //持仓保证金
-                    BigDecimal imr = PositionsWs.getAccountMap(positionAccountName).get("imr");
-                    String pingCangImr = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.PING_CANG_SHOUYI.name());
-                    BigDecimal imrValue = imr.multiply(new BigDecimal(pingCangImr));
-
-                    if (realizedPnlValue.compareTo(BigDecimal.ZERO) <= 0) {
-                        BigDecimal realizedPnlValueZheng = realizedPnlValue.multiply(new BigDecimal("-1"));
-                        if (uplValue.compareTo(realizedPnlValue) > 0 && uplValue.compareTo(imrValue.add(realizedPnlValueZheng))  >= 0) {
-                            log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(realizedPnlValueZheng));
-                            WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                            return OrderParamEnums.BUY.getValue();
-                        }else{
-                            log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(realizedPnlValueZheng));
-                            return OrderParamEnums.HOLDING.getValue();
-                        }
-                    }else {
-                        if (uplValue.compareTo(imrValue.add(feeValue))  >= 0) {
-                            WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                            log.info("当前未实现盈亏:{}大于预计收益>{},赚钱咯", uplValue, imrValue.add(feeValue));
-                            return OrderParamEnums.BUY.getValue();
-                        }else{
-                            log.info("当前未实现盈亏:{}没有大于预计收益>{},钱在路上了", uplValue, imrValue.add(feeValue));
-                            return OrderParamEnums.HOLDING.getValue();
-                        }
-                    }
-                } else {
-                    log.info("未触发减仓......,等待");
-                    return OrderParamEnums.HOLDING.getValue();
                 }
             } else if (avgPx.compareTo(markPx) < 0) {
-                log.info("开始加仓...");
-                if (queuePingCang.isEmpty()) {
-                    // 队列为空
-                    log.info("开始加仓,但是超出了网格设置...");
-                    return OrderParamEnums.HOLDING.getValue();
-                }
-                AscBigDecimal pingCang = queuePingCang.peek();
-                log.info("上限队列价格: {}", pingCang);
-                if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
-                    log.info("开始加仓...上限队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
-                    WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
-                    boolean buyCntTimeFlag = buyCntTimeShortEvent(accountName, avgPx, markPx);
-                    if (buyCntTimeFlag){
-                        log.info("加仓参数准备成功......");
-                        return OrderParamEnums.SELL.getValue();
-                    }else{
-                        log.error("加仓参数准备失败......");
-                        return null;
+                log.info("开始卖出开空...");
+                if (!queuePingCang.isEmpty()) {
+                    AscBigDecimal pingCang = queuePingCang.peek();
+                    log.info("上限队列价格: {}", pingCang.getValue());
+                    if (pingCang != null && markPx.compareTo(pingCang.getValue()) >= 0 && avgPx.compareTo(pingCang.getValue()) < 0) {
+                        log.info("开始加仓...上限队列价格小于当前价格{}<={}", pingCang.getValue(), markPx);
+                        WsMapBuild.saveStringToMap(OrderInfoWs.getAccountMap(accountName), "orderPrice", String.valueOf(markPx));
+                        String side = CoinEnums.SIDE_SELL.getCode();
+                        tradeRequestParam.setSide(side);
+                        String clOrdId = WsParamBuild.getOrderNum(side);
+                        tradeRequestParam.setClOrdId(clOrdId);
+                        String sz = buyCntTimeShortEvent(accountName, avgPx, markPx);
+                        tradeRequestParam.setSz(sz);
+                        log.info("卖出开空参数准备成功......");
+                    } else {
+                        log.info("未触发加仓......,等待");
                     }
-                } else {
-                    log.info("未触发加仓......,等待");
+                }else{
+                    // 队列为空
+                    log.info("超出了网格设置...");
                 }
             } else {
                 log.info("价格波动较小......,等待");
             }
-            return null;
+            return tradeRequestParam;
         } catch (NumberFormatException e) {
-            log.error("解析价格失败,请检查Redis中的值是否合法", e);
-            return null;
+            log.error("开空方向异常", e);
+            return tradeRequestParam;
         }
     }
 
-    private boolean buyCntTimeLongEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
+    private String buyCntTimeLongEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
         //判断当前价格和开仓价格直接间隔除以间距,取整,获取的数量是否大于等于0,如果大于0,则下单基础张数*倍数
         String buyCntTime = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_TIME.name());
+        log.info("倍数次数间隔{}", buyCntTime);
         BigDecimal subtract = avgPx.subtract(markPx);
+        log.info("倍数价格差距{}", subtract);
         BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
-        if (divide.compareTo(BigDecimal.ZERO) <= 0){
-            log.warn("加仓次数间隔时间小于0,不加仓");
-            return false;
-        }
-        return WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "buyCntTime",String.valueOf(divide));
+        log.info("倍数次数{}", divide);
+        String buyCntInit = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+        return String.valueOf(divide.multiply(new BigDecimal(buyCntInit)));
     }
 
-    private boolean buyCntTimeShortEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
+    private String buyCntTimeShortEvent(String accountName, BigDecimal avgPx, BigDecimal markPx){
         //判断当前价格和开仓价格直接间隔除以间距,取整,获取的数量是否大于等于0,如果大于0,则下单基础张数*倍数
+
         String buyCntTime = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_TIME.name());
+        log.info("倍数次数间隔{}", buyCntTime);
         BigDecimal subtract = markPx.subtract(avgPx);
+        log.info("倍数价格差距{}", subtract);
         BigDecimal divide = subtract.divide(new BigDecimal(buyCntTime), 0, RoundingMode.DOWN).add(BigDecimal.ONE);
-        if (divide.compareTo(BigDecimal.ZERO) <= 0){
-            log.warn("加仓次数间隔时间小于0,不加仓");
-            return false;
-        }
-        return WsMapBuild.saveStringToMap(TradeOrderWs.getAccountMap(accountName), "buyCntTime",String.valueOf(divide));
+        log.info("倍数次数{}", divide);
+        String buyCntInit = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
+        return String.valueOf(divide.multiply(new BigDecimal(buyCntInit)));
     }
 
     /**

--
Gitblit v1.9.1