From 343a75711545b39bf7cbaddd48c52edcd6560410 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 10 Jul 2020 13:21:40 +0800
Subject: [PATCH] 20200710 代码提交
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index bf4d078..730ebbd 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -16,7 +16,7 @@
/**
* 计算预估强平价
*
- * @param bondAmount 保证金
+ * @param bondAmount 保证金
* @param openPrice 开仓价
* @param symbolSkuNumber 张数
* @param lotNumber 规格
@@ -31,16 +31,14 @@
BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
//卖空
if (type == 2) {
- log.info("---->{}", money);
- log.info("------>{}", openPrice);
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