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 |   10 ++++++++--
 1 files changed, 8 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 c0a3202..8788787 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 {
 
     /**
@@ -30,15 +32,19 @@
         //卖空
         if (type == 2) {
             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