From c6469e2b7ce6048bd0edca3808083c8d09787dd2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 20:22:17 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 15 ++++-----------
src/test/java/com/xcong/excoin/SymbolsTest.java | 4 ++--
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 23d99c0..0ef6ae6 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -30,22 +30,15 @@
MemberSettingDao memberSettingDao = SpringContextHolder.getBean(MemberSettingDao.class);
BigDecimal forcePrice = BigDecimal.ZERO;
BigDecimal money = bondAmount.divide(new BigDecimal(symbolSkuNumber).multiply(lotNumber), 8, BigDecimal.ROUND_DOWN);
+ if (member.getIsForce() == 1) {
+ MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
+ money = money.multiply(memberSetting.getForceParam().multiply(BigDecimal.valueOf(100)));
+ }
//卖空
if (type == 2) {
forcePrice = money.add(openPrice);
- if (member.getIsForce() == 1) {
- MemberSettingEntity memberSetting = memberSettingDao.selectMemberSettingByMemberId(member.getId());
- //预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.subtract(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
- }
} else {//开多
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()));
- }
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
forcePrice = BigDecimal.ZERO;
diff --git a/src/test/java/com/xcong/excoin/SymbolsTest.java b/src/test/java/com/xcong/excoin/SymbolsTest.java
index 8162913..417e941 100644
--- a/src/test/java/com/xcong/excoin/SymbolsTest.java
+++ b/src/test/java/com/xcong/excoin/SymbolsTest.java
@@ -121,9 +121,9 @@
@Test
public void forceTest() {
- ContractHoldOrderEntity hold = contractHoldOrderDao.selectById(28257L);
+ ContractHoldOrderEntity hold = contractHoldOrderDao.selectById(28284L);
MemberEntity memberEntity = memberDao.selectById(6L);
- BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount().subtract(hold.getOpeningFeeAmount()), hold.getOpeningPrice(), hold.getLeverRatio(), hold.getSymbolSku(), 2, memberEntity);
+ BigDecimal forceSetPrice = CalculateUtil.getForceSetPrice(hold.getBondAmount(), hold.getOpeningPrice(), hold.getSymbolCnt(), hold.getSymbolSku(), hold.getOpeningType(), memberEntity);
System.out.println(forceSetPrice);
}
}
--
Gitblit v1.9.1