From de38155f608f47bd89a58c6790c82bbb4b2c58d8 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 05 Jan 2026 16:40:37 +0800
Subject: [PATCH] fix(okxNewPrice): 解决K线数据处理中的数组越界问题

---
 src/main/java/com/xcong/excoin/utils/CalculateUtil.java |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 23d99c0..0ef6ae6 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -30,22 +30,15 @@
         MemberSettingDao memberSettingDao = SpringContextHolder.getBean(MemberSettingDao.class);
         BigDecimal forcePrice = BigDecimal.ZERO;
         BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
+        if (member.getIsForce() == 1) {
+            MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
+            money = money.multiply(memberSetting.getForceParam().multiply(BigDecimal.valueOf(100)));
+        }
         //卖空
         if (type == 2) {
             forcePrice = money.add(openPrice);
-            if (member.getIsForce() == 1) {
-                MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
-                //预估强平价 = 预估强平价-预估强平价*系数
-                forcePrice = forcePrice.subtract(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
-            }
         } else {//开多
             forcePrice = openPrice.subtract(money);
-            if (member.getIsForce() == 1) {
-                MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
-                log.info("---强平价系数-->{}", memberSetting.getForceParam());
-                //预估强平价 = 预估强平价-预估强平价*系数
-                forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
-            }
         }
         if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
             forcePrice = BigDecimal.ZERO;

--
Gitblit v1.9.1