From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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..c316708 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);
@@ -482,6 +487,9 @@
if (CollUtil.isNotEmpty(list)) {
for (HoldOrderDataModel holdOrderDataModel : list) {
ContractHoldOrderEntity holdOrderEntity = contractHoldOrderDao.selectById(holdOrderDataModel.getId());
+ if (holdOrderEntity == null) {
+ continue;
+ }
contractHoldOrderDao.deleteById(holdOrderDataModel.getId());
@@ -495,9 +503,9 @@
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().negate()));
contractOrderEntity.setClosingPrice(holdOrderDataModel.getClosingPrice());
- contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
+// contractOrderEntity.setForceClosingPrice(holdOrderDataModel.getClosingPrice());
// 订单状态转换
if (ContractOrderEntity.ORDER_TYPE_OPEN_MORE == contractOrderEntity.getOrderType()) {
@@ -506,7 +514,6 @@
contractOrderEntity.setOrderType(ContractOrderEntity.ORDER_TYPE_CLOSE_LESS);
}
contractOrderEntity.setClosingTime(new Date());
- contractOrderEntity.setClosingFeeAmount(holdOrderEntity.getOpeningFeeAmount());
contractOrderDao.insert(contractOrderEntity);
}
--
Gitblit v1.9.1