From d3e3d0b1cd7ff989f62db25391826e4ebb5c7a88 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jul 2020 11:36:07 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..2653e31 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -3,32 +3,36 @@
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 {
/**
* 计算预估强平价
*
- * @param bondAmount 保证金
+ * @param bondAmount 保证金
* @param openPrice 开仓价
* @param symbolSkuNumber 张数
* @param lotNumber 规格
* @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) {
+ log.info("---->{}", member);
+ log.info("------>{}", member.getIsProfit());
forcePrice = money.add(openPrice);
if (member.getIsProfit() == 1) {
//预估强平价 = 预估强平价-预估强平价*系数
--
Gitblit v1.9.1