fix(okx): 调整账户状态与保证金计算逻辑

Administrator

2025-12-11 87c31b6e2c11a82d92389194e190d6b2eefd939a

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

@@ -52,10 +52,7 @@
            JSONArray argsArray = new JSONArray();
            JSONObject args = new JSONObject();
            args.put("channel", ACCOUNTWS_CHANNEL);
//            args.put(CCY_KEY, CoinEnums.USDT.getCode());
            JSONObject updateInterval = new JSONObject();
            updateInterval.put("updateInterval",CoinEnums.UPDATEINTERVAL.getCode());
            args.put("extraParams", updateInterval);
            args.put(CCY_KEY, CoinEnums.USDT.getCode());
            argsArray.add(args);

            String connId = MallUtils.getOrderNum(ACCOUNTWS_CHANNEL);
@@ -97,11 +94,6 @@
                        JSONObject detail = detailsArray.getJSONObject(j);

                        String ccy = detail.getString(CCY_KEY);
                        if (!CoinEnums.USDT.getCode().equals(ccy)) {
                            log.warn("账户频道币种不匹配，跳过处理");
                            continue;
                        }

                        String availBalStr = detail.getString(AVAIL_BAL_KEY);
                        String cashBalStr = detail.getString(CASH_BAL_KEY);
                        String eq = detail.getString(EQ_KEY);
@@ -123,11 +115,10 @@
                        BigDecimal divide = availBal.divide(cashBal, 4, RoundingMode.DOWN);

                        String state = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":state");
                        String out = (String) redisUtils.get(InstrumentsWs.INSTRUMENTSWS_CHANNEL + ":" + CoinEnums.HE_YUE.getCode() + ":out");
                        if (OrderParamEnums.STATE_4.getValue().equals(state)){
                            log.info(OrderParamEnums.STATE_4.getName());
                            state = OrderParamEnums.STATE_4.getValue();
                        }else if(OrderParamEnums.STATE_3.getValue().equals(state) && OrderParamEnums.OUT_YES.getValue().equals(out)){
                        }else if(OrderParamEnums.STATE_3.getValue().equals(state)){
                            log.info(OrderParamEnums.STATE_3.getName());
                            state = OrderParamEnums.STATE_3.getValue();
                        }else{
@@ -138,8 +129,8 @@
                                log.warn(OrderParamEnums.STATE_2.getName());
                                state = OrderParamEnums.STATE_2.getValue();
                            } else {
                                log.error(OrderParamEnums.STATE_0.getName());
                                state = OrderParamEnums.STATE_0.getValue();
                                log.error(OrderParamEnums.STATE_3.getName());
                                state = OrderParamEnums.STATE_3.getValue();
                            }
                        }