refactor(indicator): 重构MACD_MA策略的持仓状态和交易逻辑

Administrator

2025-12-29 b22f1797312ac54028f24c50ef9277f75c8ef9fc

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

@@ -371,21 +371,23 @@
                            tradeRequestParam.setClOrdId(clOrdId);

                            String sz = null;
                            if (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_BUY.getCode()){
                            if (
                                    (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_BUY.getCode())
                                            ||
                                            (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_SELL.getCode())
                            ){
                                sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
                                tradeRequestParam.setSz(sz);
                                TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
                            }else if (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_SELL.getCode()){
                                sz = InstrumentsWs.getAccountMap(accountName).get(CoinEnums.BUY_CNT_INIT.name());
                                tradeRequestParam.setSz(sz);
                                TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
                            }else if (
                                    (posSide == CoinEnums.POSSIDE_LONG.getCode() && side == CoinEnums.SIDE_SELL.getCode())
                                            ||
                                            (posSide == CoinEnums.POSSIDE_SHORT.getCode() && side == CoinEnums.SIDE_BUY.getCode())
                            ){
                                BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, posSide)).get("pos");

                                BigDecimal pos = PositionsWs.getAccountMap(PositionsWs.initAccountName(accountName, CoinEnums.POSSIDE_LONG.getCode())).get("pos");
                                if (BigDecimal.ZERO.compareTo( pos) >= 0) {
                                    TradeRequestParam tradeRequestParamOld = caoZuoService.caoZuoZhiSunEvent(accountName, String.valueOf(closePx), CoinEnums.POSSIDE_LONG.getCode());
                                    TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParamOld);
                                sz = String.valueOf(pos);
                                }
                            }
                            tradeRequestParam.setSz(sz);
                            TradeOrderWs.orderEvent(client.getWebSocketClient(), tradeRequestParam);
                        }
                    }
                }