From eed344dc081e4d6793da9dca7d7b46247016382c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 10 Sep 2020 11:31:15 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 64 +++++++++++++++++++++++++++-----
1 files changed, 54 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 3314803..46ecab0 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -2,6 +2,7 @@
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.common.enumerates.CoinTypeEnum;
import com.xcong.excoin.common.enumerates.RabbitPriceTypeEnum;
@@ -85,7 +86,7 @@
* 全仓模式 -- 预估强平价
* 开仓价 - (权益 - 其他币种成本)/当前币种成本 * (开仓价 * 杠杆)
*/
- public static BigDecimal getForceSetPriceForWhole(@NotNull String currentSymbol, @NotNull MemberEntity memberEntity) {
+ public static BigDecimal getForceSetPriceForWhole(String currentSymbol, @NotNull MemberEntity memberEntity) {
ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
@@ -111,10 +112,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);
@@ -130,19 +135,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);
+// 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 divide = sub.divide(symbolBondAmount, 8, BigDecimal.ROUND_DOWN);
- log.info("divide -- {}", divide);
+// log.info("divide -- {}", divide);
BigDecimal divide2 = openPrice.divide(BigDecimal.valueOf(leverRatio), 8, BigDecimal.ROUND_DOWN);
- log.info("divide2 -- {}", divide2);
+// log.info("divide2 -- {}", divide2);
- BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2));
- log.info("forcePrice -- {}", forcePrice);
- holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
+ 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;
}
}
@@ -231,4 +250,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