Administrator
2025-12-12 65c816f4c353946f165808cb60d5e5373bae4d96
refactor(okx): 修改账户WebSocket数据类型为字符串

- 将ACCOUNTWSMAP的值类型从BigDecimal改为String
- 更新所有相关的类型转换逻辑以适配新的数据类型
- 保留数值计算时的安全转换方法parseBigDecimalSafe
- 在WsMapBuild工具类中增加对小数位数的控制处理
3 files modified
42 ■■■■ changed files
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java 29 ●●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/utils/WsMapBuild.java 4 ●●● patch | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/okxNewPrice/celue/CaoZuoServiceImpl.java
@@ -39,8 +39,8 @@
    @Override
    public String caoZuo() {
        log.info("开始执行操作CaoZuoServiceImpl......");
        BigDecimal cashBal = AccountWs.ACCOUNTWSMAP.get("cashBal");
        BigDecimal availBal = AccountWs.ACCOUNTWSMAP.get("availBal");
        BigDecimal cashBal = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get("cashBal"));
        BigDecimal availBal = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get("availBal"));
        // 判断账户余额是否充足
        if (cashBal.compareTo(BigDecimal.ZERO) <= 0){
@@ -100,13 +100,14 @@
            return OrderParamEnums.HOLDING.getValue();
        }
        BigDecimal ordFroz = AccountWs.ACCOUNTWSMAP.get("ordFroz");
        BigDecimal ordFroz = WsMapBuild.parseBigDecimalSafe(AccountWs.ACCOUNTWSMAP.get("ordFroz"));
        if (BigDecimal.ZERO.compareTo( ordFroz) >= 0) {
            log.error("占用保证金为零,进行初始化订单");
            return OrderParamEnums.INIT.getValue();
        }
        // 判断是否保证金超标
        BigDecimal totalOrderUsdt = AccountWs.ACCOUNTWSMAP.get(CoinEnums.TOTAL_ORDER_USDT.name());
        BigDecimal totalOrderUsdt = WsMapBuild.parseBigDecimalSafe(CoinEnums.TOTAL_ORDER_USDT.name());
        if (ordFroz.compareTo(totalOrderUsdt) >= 0){
            log.error("已满仓......");
            return OrderParamEnums.HOLDING.getValue();
src/main/java/com/xcong/excoin/modules/okxNewPrice/okxWs/AccountWs.java
@@ -24,7 +24,7 @@
@Slf4j
public class AccountWs {
    public static  final Map<String,BigDecimal> ACCOUNTWSMAP = new ConcurrentHashMap<>();
    public static  final Map<String,String> ACCOUNTWSMAP = new ConcurrentHashMap<>();
    /**
     * 账户频道名称常量
     */
@@ -87,22 +87,23 @@
                        String eqKey = "eq";
                        String ordFrozKey = "ordFroz";
                        BigDecimal ccy = WsMapBuild.parseBigDecimalSafe(detail.getString(ccyKey));
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ccyKey, ccy);
                        String ccy = (String) detail.getString(ccyKey);
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ccyKey, ccy);
                        BigDecimal availBal = WsMapBuild.parseBigDecimalSafe(detail.getString(availBalKey));
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, availBalKey, availBal);
                        String availBal = (String) (detail.getString(availBalKey));
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, availBalKey, availBal);
                        BigDecimal cashBal = WsMapBuild.parseBigDecimalSafe(detail.getString(cashBalKey));
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
                        String cashBal = (String)(detail.getString(cashBalKey));
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, cashBalKey, cashBal);
                        BigDecimal eq = WsMapBuild.parseBigDecimalSafe(detail.getString(eqKey));
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, eqKey, eq);
                        String eq = (String)(detail.getString(eqKey));
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, eqKey, eq);
                        BigDecimal ordFroz = WsMapBuild.parseBigDecimalSafe(detail.getString(ordFrozKey));
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, ordFrozKey, ordFroz);
                        String ordFroz = (String)(detail.getString(ordFrozKey));
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, ordFrozKey, ordFroz);
                        if (cashBal.compareTo(BigDecimal.ZERO) == 0) {
                        BigDecimal cashBalDecimal = WsMapBuild.parseBigDecimalSafe(cashBal);
                        if (cashBalDecimal.compareTo(BigDecimal.ZERO) == 0) {
                            log.warn("账户频道无效的账户余额数据,跳过处理");
                            continue;
                        }
@@ -110,8 +111,8 @@
                        // 根据可用余额计算下单总保证金
                        String total_order_usdtpecent = InstrumentsWs.INSTRUMENTSWSMAP.get(CoinEnums.TOTAL_ORDER_USDTPECENT.name());
                        BigDecimal total_order_usdt_factor = WsMapBuild.parseBigDecimalSafe(total_order_usdtpecent);
                        BigDecimal totalOrderUsdt = availBal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
                        WsMapBuild.saveBigDecimalToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), totalOrderUsdt);
                        BigDecimal totalOrderUsdt = cashBalDecimal.divide(total_order_usdt_factor, 4, RoundingMode.DOWN);
                        WsMapBuild.saveStringToMap(ACCOUNTWSMAP, CoinEnums.TOTAL_ORDER_USDT.name(), String.valueOf(totalOrderUsdt));
                        log.info(
                                "账户详情-币种: {}, 可用余额: {}, 现金余额: {}, 余额: {}, 占用保证金: {}, 下单总保证金: {}",
src/main/java/com/xcong/excoin/modules/okxNewPrice/utils/WsMapBuild.java
@@ -3,9 +3,11 @@
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.okxNewPrice.okxWs.enums.CoinEnums;
import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map;
/**
@@ -40,6 +42,6 @@
        if (value == null || value.isEmpty()) {
            return new BigDecimal(0);
        }
        return new BigDecimal(value);
        return new BigDecimal(value).setScale(Integer.parseInt(CoinEnums.TICKSZ.getCode()), RoundingMode.DOWN);
    }
}