From 5c96a980c662796045c1b741015e58790409e191 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 29 Aug 2020 16:06:34 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 c1fb604..db65c8c 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
@@ -304,7 +304,8 @@
BigDecimal fee = BigDecimal.ZERO;
if (holdOrderEntity.getSymbolCntSale() != 0) {
- fee = holdOrderEntity.getOpeningFeeAmount().divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
+ BigDecimal totalFeeAmount = contractOrderDao.selectWholeFeeAmountByOrderNo(holdOrderEntity.getOrderNo());
+ fee = totalFeeAmount.divide(BigDecimal.valueOf(holdOrderEntity.getSymbolCnt()), 8, BigDecimal.ROUND_DOWN).multiply(BigDecimal.valueOf(closeCnt));
} else {
fee = holdOrderEntity.getOpeningFeeAmount();
}
@@ -323,9 +324,19 @@
if (holdOrderEntity.getSymbolCntSale() != 0) {
holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
+ BigDecimal rewardAmount = holdOrderEntity.getRewardAmount() == null ? BigDecimal.ZERO : holdOrderEntity.getRewardAmount();
+ holdOrderEntity.setRewardAmount(rewardAmount.add(profitOrLoss));
contractHoldOrderDao.updateById(holdOrderEntity);
} else {
contractHoldOrderDao.deleteById(holdOrderEntity.getId());
+
+ // 若平掉所有张数，若存在委托平仓，则删除委托平仓记录
+ List<ContractEntrustOrderEntity> entrustOrders = contractEntrustOrderDao.selectEntrustOrderByOrderNo(holdOrderEntity.getOrderNo());
+ if (CollUtil.isNotEmpty(entrustOrders)) {
+ for (ContractEntrustOrderEntity entrustOrder : entrustOrders) {
+ contractEntrustOrderDao.deleteById(entrustOrder.getId());
+ }
+ }
}
BigDecimal changeAmount = profitOrLoss.add(bondAmount);
@@ -415,6 +426,8 @@
log.info("fee:{}", fee);
ContractOrderEntity contractOrderEntity = ContractHoldOrderEntityMapper.INSTANCE.holdOrderToOrder(holdOrderEntity);
contractOrderEntity.setId(null);
+ contractOrderEntity.setEntrustOpeningPrice(newPrice);
+ contractOrderEntity.setEntrustTime(new Date());
contractOrderEntity.setClosingPrice(newPrice);
contractOrderEntity.setOrderType(orderType);
contractOrderEntity.setClosingType(closingType);
@@ -424,7 +437,8 @@
contractOrderEntity.setClosingFeeAmount(fee);
contractOrderDao.insert(contractOrderEntity);
- if (holdOrderEntity.getSymbolCntSale() != 0) {
+ if (holdOrderEntity.getSymbolCntSale() - closeCnt != 0) {
+ holdOrderEntity.setSymbolCntSale(holdOrderEntity.getSymbolCntSale() - closeCnt);
holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
contractHoldOrderDao.updateById(holdOrderEntity);
@@ -440,6 +454,7 @@
memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, total, null, walletContract.getId());
+ contractEntrustOrderDao.deleteById(entrustOrder.getId());
ThreadPoolUtils.sendWholeForceClosingPrice(holdOrderEntity.getSymbol(), memberEntity);
// 计算佣金
ThreadPoolUtils.calReturnMoney(memberEntity.getId(), fee, contractOrderEntity, AgentReturnEntity.ORDER_TYPE_CLOSE);
--
Gitblit v1.9.1