From 1d32c206cc2c5815d43f03f17491bf933c5586d5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 27 Aug 2020 17:57:22 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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..8a1ca9b 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
@@ -415,6 +415,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 +426,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 +443,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