From dfff6a8de2ac1337c1bd44e8d2f1fd04ddc5877a Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Sep 2020 19:05:17 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 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..2a1c7b3 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -112,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);
@@ -131,21 +135,26 @@
profitOrLoss = profitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
}
- log.info("{}, {}, {}, {}, {}, {}", totalBondAmount, symbolBondAmount, symbolFeeAmount, openPrice, profitOrLoss, leverRatio);
+// 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);
+// log.info("sub -- {}", sub);
+ BigDecimal divide = sub.abs().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("divide2 -- {}", divide2);
- BigDecimal forcePrice = openPrice.subtract(divide.multiply(divide2));
- log.info("forcePrice -- {}", forcePrice);
+ BigDecimal forcePrice = BigDecimal.ZERO;
+ if (isAloneLess) {
+ forcePrice = openPrice.add(divide.multiply(divide2));
+ } else {
+ forcePrice = openPrice.subtract(divide.multiply(divide2));
+ }
+// log.info("forcePrice -- {}", forcePrice);
if (StrUtil.isBlank(currentSymbol)) {
holdOrderDao.updateForcePriceBySymbolAndMemberId(forcePrice, memberId, symbol);
}
- if (currentSymbol.equalsIgnoreCase(symbol)) {
+ if (symbol.equalsIgnoreCase(currentSymbol)) {
result = forcePrice;
}
}
@@ -234,4 +243,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