From bf68aa759bc3c0a858d80cb3d1ae1f1682cd6c94 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 06 Apr 2021 15:38:42 +0800
Subject: [PATCH] Merge branch 'activity' of http://120.27.238.55:7000/r/exchange into activity
---
src/main/java/com/xcong/excoin/utils/CalculateUtil.java | 95 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 88 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
index 6fd61f5..fc13168 100644
--- a/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
+++ b/src/main/java/com/xcong/excoin/utils/CalculateUtil.java
@@ -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);
@@ -164,6 +161,90 @@
}
return result;
+ }
+
+ /**
+ * 开仓价 +/- (权益 - 其他币种成本 - 当前币种维持保证金)/(规格*张数)
+ *
+ * @param memberEntity
+ * @param contractHoldOrderEntity
+ * @return
+ */
+ public static BigDecimal calForcePriceForWhole(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {
+ ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
+ MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
+
+ Long memberId = memberEntity.getId();
+ MemberWalletContractEntity walletContract = walletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
+ List<ContractHoldOrderEntity> holdOrderEntities = holdOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null);
+ BigDecimal forcePrice = BigDecimal.ZERO;
+ if (CollUtil.isNotEmpty(holdOrderEntities)) {
+ BigDecimal totalBondAmount = BigDecimal.ZERO;
+ BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
+ for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ if (holdOrderEntity.getId().equals(contractHoldOrderEntity.getId())) {
+// totalBondAmount = totalBondAmount.add(holdOrderEntity.getHoldBond());
+ } else {
+ totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());
+ }
+ totalProfitOrLoss = totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
+ }
+
+ BigDecimal divideChild = walletContract.getTotalBalance().subtract(totalBondAmount).add(totalProfitOrLoss);
+ BigDecimal divideParent = contractHoldOrderEntity.getSymbolSku().multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
+
+ BigDecimal divide = divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN);
+
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
+ forcePrice = contractHoldOrderEntity.getOpeningPrice().subtract(divide);
+ } else {
+ forcePrice = contractHoldOrderEntity.getOpeningPrice().add(divide);
+ }
+ }
+ return forcePrice;
+ }
+
+ public static BigDecimal calWholePriceTwo(MemberEntity memberEntity, ContractHoldOrderEntity contractHoldOrderEntity) {
+ ContractHoldOrderDao holdOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
+ MemberWalletContractDao walletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
+ RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
+ BigDecimal newPrice = new BigDecimal(redisUtils.getString(CoinTypeConvert.convertToKey(contractHoldOrderEntity.getSymbol())));
+
+ Long memberId = memberEntity.getId();
+ MemberWalletContractEntity walletContract = walletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
+ List<ContractHoldOrderEntity> holdOrderEntities = holdOrderDao.selectHoldOrderListForWholeByMemberIdAndSymbol(memberId, null);
+ BigDecimal forcePrice = BigDecimal.ZERO;
+ if (CollUtil.isNotEmpty(holdOrderEntities)) {
+ BigDecimal totalBondAmount = BigDecimal.ZERO;
+ BigDecimal totalProfitOrLoss = BigDecimal.ZERO;
+ for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
+ if (holdOrderEntity.getId().equals(contractHoldOrderEntity.getId())) {
+// totalBondAmount = totalBondAmount.add(holdOrderEntity.getHoldBond());
+ } else {
+ totalBondAmount = totalBondAmount.add(holdOrderEntity.getBondAmount());
+ }
+ totalProfitOrLoss = totalProfitOrLoss.add(calProfitOrLoss(holdOrderEntity, memberEntity));
+ }
+
+ BigDecimal holdBond = contractHoldOrderEntity.getHoldBond();
+ // 成本 数量*面值*开仓价
+ BigDecimal cost = contractHoldOrderEntity.getSymbolSku().multiply(contractHoldOrderEntity.getOpeningPrice()).multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
+ // 费率
+ BigDecimal ratio = newPrice.multiply(new BigDecimal("0.005"));
+ // 权益
+ BigDecimal qy = walletContract.getTotalBalance().add(totalProfitOrLoss);
+ BigDecimal divideChild;
+ if (ContractHoldOrderEntity.OPENING_TYPE_MORE == contractHoldOrderEntity.getOpeningType()) {
+ divideChild = holdBond.negate().subtract(cost).add(ratio).add(qy);
+ } else {
+ divideChild = holdBond.negate().subtract(cost).add(ratio).subtract(qy);
+ }
+// BigDecimal divideChild = walletContract.getTotalBalance().add(totalProfitOrLoss).subtract(holdBond).subtract(cost).add(newPrice.multiply(new BigDecimal("0.005")));
+ BigDecimal divideParent = contractHoldOrderEntity.getSymbolSku().multiply(new BigDecimal(contractHoldOrderEntity.getSymbolCntSale()));
+
+ forcePrice = divideChild.divide(divideParent, 8, BigDecimal.ROUND_DOWN).negate();
+ }
+ return forcePrice;
}
public static BigDecimal calProfitOrLoss(ContractHoldOrderEntity holdOrderEntity, MemberEntity memberEntity) {
@@ -289,6 +370,6 @@
redisUtils.set(AppContants.HOLD_BOND_RATIO, tradeSetting.getHoldBondRatio());
}
- return contractHoldOrder.getOpeningPrice().multiply(new BigDecimal(contractHoldOrder.getSymbolCntSale())).multiply(holdBondRatio).multiply(contractHoldOrder.getSymbolSku());
+ return contractHoldOrder.getOpeningPrice().multiply(new BigDecimal(contractHoldOrder.getSymbolCntSale())).multiply(holdBondRatio.multiply(new BigDecimal(100))).multiply(contractHoldOrder.getSymbolSku()).divide(new BigDecimal(contractHoldOrder.getLeverRatio()), 8, BigDecimal.ROUND_DOWN);
}
}
--
Gitblit v1.9.1