From 89d397b88a88004e73485a72ffb6e78c9e249b16 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Sat, 20 Feb 2021 17:02:56 +0800
Subject: [PATCH] ERC20同步方式完善
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 46ecab0..9eebe41 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -45,21 +45,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());
- //预估强平价 = 预估强平价-预估强平价*系数
- forcePrice = forcePrice.add(forcePrice.multiply(memberSetting.getForceParam() == null ? BigDecimal.ZERO : memberSetting.getForceParam()));
- }
}
if (forcePrice.compareTo(BigDecimal.ZERO) < 0) {
forcePrice = BigDecimal.ZERO;
@@ -156,9 +150,9 @@
} else {
forcePrice = openPrice.subtract(divide.multiply(divide2));
}
- log.info("forcePrice -- {}, {}", forcePrice, symbol);
+// log.info("forcePrice -- {}, {}", forcePrice, symbol);
if (StrUtil.isBlank(currentSymbol)) {
-// holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
+ holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
}
if (symbol.equalsIgnoreCase(currentSymbol)) {
--
Gitblit v1.9.1