6ed2a8742d41f1b7cf968134d98ccf2014b59752..80a473014583e2d11470b1ab99a0adb6c93aab86
6 days ago Administrator
fix(okxWs): 修复枚举值描述错误
80a473 diff | tree
6 days ago Administrator
refactor(okxWs): 移除持仓价格比较逻辑并简化交易类型设置
43d869 diff | tree
2 files modified
25 ■■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/OrderInfoWs.java 22 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/CoinEnums.java 3 ●●●● 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{
                        tradeRequestParam.setTradeType(OrderParamEnums.TRADE_YES.getValue());
                    }
//                    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);
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/enums/CoinEnums.java
@@ -53,7 +53,8 @@
    BUY_CNT("每次开仓的张数buyCnt","0.1"),
    BUY_CNT_INIT("每次初始化开仓张数的基础值buyCntInit","0.1"),
    BUY_CNT_TIME("每次开仓张数的倍数基础值buyCntTime","20"),
    OUT("是否允许下单out","操作中"),
//    OUT("是否允许下单out","操作中"),
    OUT("是否允许下单out","冷静中"),
    CTVAL("合约面值ctVal","0.1"),
    CONTRACTMULTIPLIER("合约乘积ctVal","1"),
    TICKSZ("下单价格精度tickSz","2"),