From 93f9a2ed87466c59c54453f93ac77c6af7a8b485 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 09 Jul 2020 12:36:28 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 12 +++++++-----
1 files changed, 7 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..8788787 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,18 +31,20 @@
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) {
+ log.info("预估强评价:{},{},{}", forcePrice, tradeSetting.getForceParam(), "空");
//预估强平价 = 预估强平价-预估强平价*系数
forcePrice = forcePrice.subtract(forcePrice.multiply(tradeSetting.getForceParam()));
+ log.info("预估强评价:{}", forcePrice);
}
} else {//开多
forcePrice = openPrice.subtract(money);
- if (member.getIsProfit() == 1) {
+ if (member.getIsForce() == 1) {
+ log.info("预估强评价:{},{},{}", forcePrice, tradeSetting.getForceParam(), "多");
//预估强平价 = 预估强平价-预估强平价*系数
forcePrice = forcePrice.add(forcePrice.multiply(tradeSetting.getForceParam()));
+ log.info("预估强评价:{}", forcePrice);
}
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
--
Gitblit v1.9.1