From d7d0550da50ee64d0916cde55ed5991de8e74c64 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 02 Feb 2021 11:34:37 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
index 61a73e7..e7f5533 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java
@@ -353,6 +353,8 @@
memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
+ ThreadPoolUtils.sendWholePrice(memberEntity.getId());
+
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
@@ -468,6 +470,9 @@
memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
contractEntrustOrderDao.deleteById(entrustOrder.getId());
+
+ ThreadPoolUtils.sendWholePrice(memberEntity.getId());
+
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
@@ -477,12 +482,17 @@
@Override
public void wholeBombOrder(WholePriceDataModel wholePriceData) {
MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(wholePriceData.getMemberId(), CoinTypeEnum.USDT.name());
-
+ MemberEntity memberEntity = memberDao.selectById(wholePriceData.getMemberId());
List<HoldOrderDataModel> list = wholePriceData.getList();
if (CollUtil.isNotEmpty(list)) {
for (HoldOrderDataModel holdOrderDataModel : list) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
+ if (holdOrderEntity == null) {
+ log.info("持仓不存在:{}", holdOrderDataModel.getId());
+ continue;
+ }
+ holdOrderEntity.setForceClosingPrice(getForceSetPrice(wholePriceData, holdOrderEntity));
contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
@@ -495,9 +505,8 @@
BigDecimal rewardRatio = holdOrderDataModel.getRewardAmount().divide(holdOrderEntity.getBondAmount().subtract(holdOrderEntity.getOpeningFeeAmount()), 8, BigDecimal.ROUND_DOWN);
contractOrderEntity.setRewardRatio(rewardRatio);
- contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount());
+ contractOrderEntity.setRewardAmount(holdOrderDataModel.getRewardAmount().add(contractOrderEntity.getBondAmount().subtract(contractOrderEntity.getOpeningFeeAmount()).negate()));
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
- contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
@@ -506,7 +515,6 @@
contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
}
contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setClosingFeeAmount(holdOrderEntity.getOpeningFeeAmount());
contractOrderDao.insert(contractOrderEntity);
}
@@ -520,6 +528,8 @@
}
memberWalletContractDao.increaseWalletContractBalanceById(wallet.getAvailableBalance().negate(), wallet.getTotalBalance().subtract(totalAmount).negate(), null, wallet.getId());
+ } else {
+ log.info("参数有误:{}", memberEntity.getId());
}
}
@@ -592,4 +602,16 @@
}
}
}
+
+ /**
+ * 1 2 3
+ * 开仓价 - (权益 - 其他币种成本)/当前币种成本 * (开仓价 * 1/杠杆)
+ *
+ * @param dataModel
+ * @param holdOrder
+ * @return
+ */
+ private BigDecimal getForceSetPrice(WholePriceDataModel dataModel, ContractHoldOrderEntity holdOrder) {
+ return holdOrder.getOpeningPrice().subtract(holdOrder.getOpeningPrice().multiply(BigDecimal.ONE.divide(new BigDecimal(holdOrder.getLeverRatio()), 8, BigDecimal.ROUND_DOWN)));
+ }
}
--
Gitblit v1.9.1