From cfaff35be33039d02fe55a162e4ea067e1fd1651 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 16:30:29 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 730ebbd..a11fcb6 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -26,7 +26,6 @@
public static BigDecimal getForceSetPrice(BigDecimal bondAmount, BigDecimal openPrice, int symbolSkuNumber, BigDecimal lotNumber,
int type, MemberEntity member) {
CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);
- PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
BigDecimal forcePrice = BigDecimal.ZERO;
BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
//卖空
@@ -34,13 +33,13 @@
forcePrice = money.add(openPrice);
if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.subtract(forcePrice.multiply(tradeSetting.getForceParam()));
+ forcePrice = forcePrice.subtract(forcePrice.multiply(member.getForceParam()));
}
} else {//开多
forcePrice = openPrice.subtract(money);
if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.add(forcePrice.multiply(tradeSetting.getForceParam()));
+ forcePrice = forcePrice.add(forcePrice.multiply(member.getForceParam()));
}
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
--
Gitblit v1.9.1