Administrator
6 days ago 43d869cf5d0ccbfd4d4d8d4200669a4dce753ca6
refactor(okxWs): 移除持仓价格比较逻辑并简化交易类型设置

- 注释掉原有的平均持仓价格获取和日志记录代码
- 移除根据持仓方向和止盈价格比较来设置交易类型的复杂逻辑
- 直接将交易类型设置为TRADE_YES,简化订单处理流程
- 保留了持仓方向判断和订单参数设置的核心逻辑
1 files modified
20 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java 20 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java
@@ -161,16 +161,18 @@
                    tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
                    // 获取平均持仓价格
                    // 在获取数据时提供默认值
                    BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
                    log.info("持仓方向{},当前持仓价格{},止盈价格{}",posSide,avgPxOld,zhiYingPx);
                    //根据持仓方向,判断是否需要设置限价止盈
                    if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) > 0){
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
                    }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) < 0){
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
                    }else{
//                    BigDecimal avgPxOld = positionsMap.get("avgPx") != null ? positionsMap.get("avgPx") : BigDecimal.ZERO;
//                    log.info("持仓方向{},当前持仓价格{},止盈价格{}",posSide,avgPxOld,zhiYingPx);
//                    //根据持仓方向,判断是否需要设置限价止盈
//                    if (CoinEnums.POSSIDE_LONG.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) > 0){
//                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
//                    }else if (CoinEnums.POSSIDE_SHORT.getCode().equals(posSide) && zhiYingPx.compareTo(avgPxOld) < 0){
//                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_NO.getValue());
//                    }else{
//                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
//                    }
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
                    }
                    tradeRequestParam.setSide(CoinEnums.POSSIDE_LONG.getCode().equals(posSide) ? CoinEnums.SIDE_SELL.getCode() : CoinEnums.SIDE_BUY.getCode());
                    tradeRequestParam.setClOrdId(WsParamBuild.getOrderNum(side));
                    tradeRequestParam.setSz(accFillSz);