fix(strategy): 修复MACD策略日志输出和网格止损逻辑

Administrator

6 days ago 36c1ee6acf1e2185924ca3fc817c8641d44c4d39

 src/main/java/com/xcong/excoin/modules/okxNewPrice/OkxKlineWebSocketClient.java

@@ -375,7 +375,7 @@
                                doOpen(client.getWebSocketClient(),accountName, tradingOrderOpenOpen, closePx);
                            }
                            if (ObjectUtil.isNotEmpty(tradingOrderOpenClose)){
                                doOpen(client.getWebSocketClient(),accountName, tradingOrderOpenClose, closePx);
                                doclose(client.getWebSocketClient(),accountName, tradingOrderOpenClose, closePx);
                            }
                        }
                    }
@@ -405,6 +405,10 @@

        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));
        TradeOrderWs.orderZhiYingZhiSunEventNoState(webSocketClient, tradeRequestParam);
    }