From 5d9d55ef623688d540171f16f16dbeeb4a264531 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 18:20:57 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 1 +
src/test/java/com/xcong/excoin/SymbolsTest.java | 9 +++++++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 692d02b..23d99c0 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -42,6 +42,7 @@
forcePrice = openPrice.subtract(money);
if (member.getIsForce() == 1) {
MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
+ log.info("---强平价系数-->{}", memberSetting.getForceParam());
//预估强平价 = 预估强平价-预估强平价*系数
forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
}
diff --git a/src/test/java/com/xcong/excoin/SymbolsTest.java b/src/test/java/com/xcong/excoin/SymbolsTest.java
index cfe29de..8162913 100644
--- a/src/test/java/com/xcong/excoin/SymbolsTest.java
+++ b/src/test/java/com/xcong/excoin/SymbolsTest.java
@@ -17,6 +17,7 @@
import com.xcong.excoin.modules.symbols.service.SymbolsService;
import com.xcong.excoin.rabbit.producer.OrderProducer;
import com.xcong.excoin.utils.CacheSettingUtils;
+import com.xcong.excoin.utils.CalculateUtil;
import com.xcong.excoin.utils.CoinTypeConvert;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
@@ -117,4 +118,12 @@
log.info("----->{}", totalProfitOrLess);
}
+
+ @Test
+ public void forceTest() {
+ ContractHoldOrderEntity hold = contractHoldOrderDao.selectById(28257L);
+ MemberEntity memberEntity = memberDao.selectById(6L);
+ BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount().subtract(hold.getOpeningFeeAmount()), hold.getOpeningPrice(), hold.getLeverRatio(), hold.getSymbolSku(), 2, memberEntity);
+ System.out.println(forceSetPrice);
+ }
}
--
Gitblit v1.9.1