From d60ef625703cef756ca37155357906f54436e8e3 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Jul 2020 18:02:39 +0800
Subject: [PATCH] Merge branch 'master' into follow
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index a11fcb6..2e0e201 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -33,13 +33,13 @@
forcePrice = money.add(openPrice);
if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.subtract(forcePrice.multiply(member.getForceParam()));
+ forcePrice = forcePrice.subtract(forcePrice.multiply(member.getForceParam() == null ? BigDecimal.ZERO : member.getForceParam()));
}
} else {//开多
forcePrice = openPrice.subtract(money);
if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.add(forcePrice.multiply(member.getForceParam()));
+ forcePrice = forcePrice.add(forcePrice.multiply(member.getForceParam() == null ? BigDecimal.ZERO : member.getForceParam()));
}
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
--
Gitblit v1.9.1