From afc924b0d88ef320ad09060ae49804556efd8eb6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 11 Sep 2020 10:08:25 +0800
Subject: [PATCH] Merge branch 'master' into whole_new
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 55 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 1fc3d1f..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;
@@ -112,10 +106,14 @@
BigDecimal profitOrLoss = BigDecimal.ZERO;
// 杠杆
int leverRatio = 0;
+ boolean isAloneLess = true;
for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
BigDecimal bondAmount = holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount());
if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) {
+ if (holdOrderEntity.getOpeningType() == ContractHoldOrderEntity.OPENING_TYPE_MORE) {
+ isAloneLess = false;
+ }
symbolFeeAmount = symbolFeeAmount.add(holdOrderEntity.getOpeningFeeAmount());
symbolBondAmount = symbolBondAmount.add(bondAmount);
@@ -131,21 +129,33 @@
profitOrLoss = profitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
}
- log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
- BigDecimal sub = walletContract.getTotalBalance().add(profitOrLoss).subtract(symbolFeeAmount).subtract(totalBondAmount);
- log.info("sub -- {}", sub);
- BigDecimal divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
- log.info("divide -- {}", divide);
- BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN);
- log.info("divide2 -- {}", divide2);
+// log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
+ BigDecimal equity = walletContract.getTotalBalance().add(profitOrLoss);
+ BigDecimal sub = equity.subtract(symbolFeeAmount).subtract(totalBondAmount);
+// log.info("sub -- {}", sub);
+ if (sub.compareTo(symbolBondAmount) <= 0) {
+ BigDecimal multi = BigDecimal.valueOf(10);
+ BigDecimal divide = equity.divide(equity.add(multi), 8, BigDecimal.ROUND_DOWN);
+ sub = symbolBondAmount.multiply(divide);
+ }
- BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2));
- log.info("forcePrice -- {}", forcePrice);
+ BigDecimal divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
+// log.info("divide -- {}", divide);
+ BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN);
+// log.info("divide2 -- {}", divide2);
+
+ BigDecimal forcePrice = BigDecimal.ZERO;
+ if (isAloneLess) {
+ forcePrice = openPrice.add(divide.multiply(divide2));
+ } else {
+ forcePrice = openPrice.subtract(divide.multiply(divide2));
+ }
+// log.info("forcePrice -- {}, {}", forcePrice, symbol);
if (StrUtil.isBlank(currentSymbol)) {
holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
}
- if (currentSymbol.equalsIgnoreCase(symbol)) {
+ if (symbol.equalsIgnoreCase(currentSymbol)) {
result = forcePrice;
}
}
@@ -234,4 +244,29 @@
.multiply(feeRatio.divide(new BigDecimal(100)))
.setScale(8, BigDecimal.ROUND_DOWN);
}
+
+ public static BigDecimal calOrderProfitOrLess(int type, BigDecimal newPrice, BigDecimal openPrice, BigDecimal lotNumber, int symbolCnt, int isProfit) {
+ CacheSettingUtils cacheSettingUtils = SpringContextHolder.getBean(CacheSettingUtils.class);
+
+ PlatformTradeSettingEntity tradeSetting = cacheSettingUtils.getTradeSetting();
+ // 单个订单盈利
+ BigDecimal profitOrLess = BigDecimal.ZERO;
+ // 开多
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == type) {
+ profitOrLess = newPrice.subtract(openPrice).multiply(new BigDecimal(symbolCnt)).multiply(lotNumber);
+ // 开空
+ } else {
+ profitOrLess = openPrice.subtract(newPrice).multiply(new BigDecimal(symbolCnt)).multiply(lotNumber);
+ }
+
+ if (MemberEntity.IS_PROFIT_Y == isProfit) {
+ if (profitOrLess.compareTo(BigDecimal.ZERO) > 0) {
+ profitOrLess = profitOrLess.multiply(BigDecimal.ONE.subtract(tradeSetting.getForceParam()));
+ } else {
+ profitOrLess = profitOrLess.multiply(BigDecimal.ONE.add(tradeSetting.getForceParam()));
+ }
+ }
+
+ return profitOrLess;
+ }
}
--
Gitblit v1.9.1