From c4dcb87cffa4ac4898b7e75d6cd88da5affffb42 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 30 Jul 2020 15:02:26 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 20cd867..2e0e201 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -3,12 +3,14 @@
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.platform.entity.PlatformTradeSettingEntity;
+import lombok.extern.slf4j.Slf4j;
import java.math.BigDecimal;
/**
* @author helius
*/
+@Slf4j
public class CalculateUtil {
/**
@@ -21,24 +23,23 @@
* @param type 1:买多2：卖空
* @return
*/
- public static BigDecimal getForceSetPrice(BigDecimal bondAmount, BigDecimal openPrice, BigDecimal symbolSkuNumber, BigDecimal lotNumber,
+ 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(symbolSkuNumber.multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
+ BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
//卖空
if (type == 2) {
forcePrice = money.add(openPrice);
- if (member.getIsProfit() == 1) {
+ if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.subtract(forcePrice.multiply(tradeSetting.getForceParam()));
+ forcePrice = forcePrice.subtract(forcePrice.multiply(member.getForceParam() == null ? BigDecimal.ZERO : member.getForceParam()));
}
} else {//开多
forcePrice = openPrice.subtract(money);
- if (member.getIsProfit() == 1) {
+ if (member.getIsForce() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.add(forcePrice.multiply(tradeSetting.getForceParam()));
+ forcePrice = forcePrice.add(forcePrice.multiply(member.getForceParam() == null ? BigDecimal.ZERO : member.getForceParam()));
}
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
--
Gitblit v1.9.1