fix(positions): 修复保证金计算逻辑并调整默认比例

Administrator

5 days ago 4bc9c7ce436f5e1f184ec6c262344099dd55531c

 src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/PositionsWs.java

@@ -65,7 +65,7 @@
        initParam(arg, accountName,CoinEnums.POSSIDE_SHORT.getCode());
    }

    public static List<TradeRequestParam> handleEvent(JSONObject response, String accountName) {
    public static void handleEvent(JSONObject response, String accountName) {


        log.info("开始执行PositionsWs......");
@@ -73,10 +73,8 @@
            JSONArray dataArray = response.getJSONArray("data");
            if (dataArray == null || dataArray.isEmpty()) {
                log.info("账户持仓频道数据为空,等待更新");
                return null;
                return;
            }

            List<TradeRequestParam> tradeRequestParamList = new ArrayList<>();

            for (int i = 0; i < dataArray.size(); i++) {
                JSONObject posData = dataArray.getJSONObject(i);
@@ -118,45 +116,11 @@
                    );
                    //先更新缓存
                    Map<String, BigDecimal> stringBigDecimalMap = initParam(posData, accountName, posSide);
                    //构建止损参数
                    if (stringBigDecimalMap.get("pos").compareTo(BigDecimal.ZERO) > 0){
                        TradeRequestParam tradeRequestParam = new TradeRequestParam();
                        // 1. 判断当前价格属于哪个网格
                        WangGeListEnum gridByPriceNew = WangGeListEnum.getGridByPrice(new BigDecimal(avgPx));
                        if (gridByPriceNew != null) {
                            String zhiSunDian = gridByPriceNew.getZhi_sun_dian();
                            String fangXiang = gridByPriceNew.getFang_xiang();
                            BigDecimal fangXiangNow = stringBigDecimalMap.get("posSide");
                            if (fangXiangNow.equals(fangXiang)){
                                tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_LIMIT.getCode());
                                tradeRequestParam.setMarkPx(String.valueOf(zhiSunDian));
                            }else{
                                tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
                                tradeRequestParam.setMarkPx(String.valueOf(markPx));
                            }
                        }else{
                            tradeRequestParam.setOrdType(CoinEnums.ORDTYPE_MARKET.getCode());
                            tradeRequestParam.setMarkPx(String.valueOf(markPx));
                        }


                        tradeRequestParam.setAccountName(accountName);
                        tradeRequestParam.setInstId(CoinEnums.HE_YUE.getCode());
                        tradeRequestParam.setTdMode(CoinEnums.CROSS.getCode());
                        tradeRequestParam.setPosSide(posSide);
                        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(tradeRequestParam.getSide()));
                        tradeRequestParam.setSz(String.valueOf(stringBigDecimalMap.get("pos")));
                        tradeRequestParamList.add(tradeRequestParam);
                    }
                }
            }
            return tradeRequestParamList;
        } catch (Exception e) {
            log.error("处理持仓频道推送数据失败", e);
        }
        return null;
    }

    private static Map<String, BigDecimal> initParam(JSONObject posData, String accountName,String posSide) {
@@ -174,8 +138,8 @@
        WsMapBuild.saveBigDecimalToMap(accountMap, "fundingFee", WsMapBuild.parseBigDecimalSafe(posData.getString("fundingFee")));

        BigDecimal ordFrozImr = PositionsWs.getAccountMap(accountNamePositons).get("imr");
        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()))
                .divide(new BigDecimal("2"), RoundingMode.DOWN);
        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(AccountWs.getAccountMap(accountName).get(CoinEnums.TOTAL_ORDER_USDT.name()));
        log.info("账户{}持仓数据, 冻结保证金: {}, 总下单金额: {}",accountNamePositons,ordFrozImr,totalOrderUsdt);
        if (ordFrozImr.compareTo(totalOrderUsdt) <= 0){
            WsMapBuild.saveBigDecimalToMap(accountMap, CoinEnums.READY_STATE.name(), WsMapBuild.parseBigDecimalSafe(CoinEnums.READY_STATE_YES.getCode()));
        }