From fb73002d31a565e65df8da36af8f3a0e20a21e9d Mon Sep 17 00:00:00 2001
From: gao <gaoleox@163>
Date: Mon, 13 Jul 2020 11:10:41 +0800
Subject: [PATCH] Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
---
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 4cdb310..730ebbd 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -32,13 +32,13 @@
//卖空
if (type == 2) {
forcePrice = money.add(openPrice);
- if (member.getIsProfit() == 1) {
+ if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
forcePrice = forcePrice.subtract(forcePrice.multiply(tradeSetting.getForceParam()));
}
} else {//开多
forcePrice = openPrice.subtract(money);
- if (member.getIsProfit() == 1) {
+ if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
forcePrice = forcePrice.add(forcePrice.multiply(tradeSetting.getForceParam()));
}
--
Gitblit v1.9.1