From f45eff2b375d45668bb2e9253b4faec2f04d39b9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 03 Mar 2021 17:21:03 +0800
Subject: [PATCH] 20210303 消息提醒更新
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index b097cd3..935f1f3 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -80,7 +80,7 @@
/**
* 全仓模式 -- 预估强平价
- * 开仓价 - (权益 - 其他币种成本)/当前币种成本 * (开仓价 * 杠杆)
+ * 开仓价 - (权益 - 其他币种成本)/当前币种成本 * (开仓价 * 1/杠杆)
*/
public static BigDecimal getForceSetPriceForWhole(String currentSymbol, @NotNull MemberEntity memberEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
@@ -97,8 +97,6 @@
for (String symbol : symbols) {
// 其他币种成本
BigDecimal totalBondAmount = BigDecimal.ZERO;
- // 当前币种手续费
- BigDecimal symbolFeeAmount = BigDecimal.ZERO;
// 当前币种保证金
BigDecimal symbolBondAmount = BigDecimal.ZERO;
@@ -116,8 +114,7 @@
if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
isAloneLess = false;
}
- symbolFeeAmount = symbolFeeAmount.add(holdOrderEntity.getOpeningFeeAmount());
- symbolBondAmount = symbolBondAmount.add(bondAmount);
+ symbolBondAmount = symbolBondAmount.add(bondAmount.subtract(holdOrderEntity.getOpeningFeeAmount()));
if (openPrice.compareTo(BigDecimal.ZERO) == 0) {
openPrice = holdOrderEntity.getOpeningPrice();
@@ -132,8 +129,8 @@
}
// log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
- BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss);
- BigDecimal sub = equity.subtract(symbolFeeAmount).subtract(totalBondAmount);
+ BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss).subtract(walletContract.getFrozenBalance());
+ BigDecimal sub = equity.subtract(totalBondAmount);
// log.info("sub -- {}", sub);
if (sub.compareTo(symbolBondAmount) <= 0) {
BigDecimal multi = BigDecimal.valueOf(10);
@@ -166,7 +163,7 @@
return result;
}
- private static BigDecimal calProfitOrLoss(ContractHoldOrderEntity holdOrderEntity, MemberEntity memberEntity) {
+ public static BigDecimal calProfitOrLoss(ContractHoldOrderEntity holdOrderEntity, MemberEntity memberEntity) {
CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);
RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
@@ -275,7 +272,7 @@
/**
* 全仓模式下，维持保证金
- * 维持保证金 = 持仓价值*维持保证金率= 面值*张数*开仓价格*(1/杠杆倍率)*维持保证金率
+ * 维持保证金 = 持仓价值*维持保证金率= 面值*张数*开仓价格*维持保证金率
* @param contractHoldOrder
* @return
*/
@@ -289,6 +286,6 @@
redisUtils.set(AppContants.HOLD_BOND_RATIO, tradeSetting.getHoldBondRatio());
}
- return contractHoldOrder.getOpeningPrice().multiply(new BigDecimal(contractHoldOrder.getSymbolCntSale())).multiply(holdBondRatio).multiply(contractHoldOrder.getSymbolSku()).multiply(BigDecimal.ONE.divide(new BigDecimal(contractHoldOrder.getLeverRatio()), 2, BigDecimal.ROUND_DOWN));
+ return contractHoldOrder.getOpeningPrice().multiply(new BigDecimal(contractHoldOrder.getSymbolCntSale())).multiply(holdBondRatio).multiply(contractHoldOrder.getSymbolSku());
}
}
--
Gitblit v1.9.1