From 68d946debea91cc5afb2f7a870bf04b393335926 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 02 Sep 2020 18:07:58 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
index 2cbd3fa..54a64c4 100644
--- a/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java
@@ -213,6 +213,7 @@
         int i = contractEntrustOrderDao.insert(entrustOrderEntity);
         memberWalletContractDao.increaseWalletContractBalanceById(entrustTotalAmount.negate(), null, entrustOrderEntity.getBondAmount(), walletContract.getId());
         if (i > 0) {
+            CalculateUtil.getForceSetPriceForWhole(submitEntrustDto.getSymbol(), memberEntity);
 
             // 发送委托单队列消息
             if (submitEntrustDto.getEntrustType() == ContractEntrustOrderEntity.ENTRUST_TYPE_OPEN_MORE) {
@@ -263,6 +264,8 @@
             LogRecordUtils.insertMemberAccountFlow(memberEntity.getId(), total, walletContractEntity.getAvailableBalance().add(total), entrustOrderEntity.getSymbol(), "撤销委托单", "撤销委托单");
         } else {
             walletContractEntity = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberEntity.getId(), CoinTypeConvert.convertContractTypeToCoin(entrustOrderEntity.getSymbol()));
+
+            memberWalletContractDao.increaseWalletContractBalanceById(entrustOrderEntity.getEntrustAmount(), null, entrustOrderEntity.getBondAmount().negate(), walletContractEntity.getId());
         }
 
         ContractOrderEntity orderEntity = ContractEntrustOrderEntityMapper.INSTANCE.entrustOrderToOrder(entrustOrderEntity);
@@ -282,6 +285,9 @@
         contractEntrustOrderDao.deleteById(entrustOrderEntity.getId());
 
         if (i > 0) {
+            if (ContractEntrustOrderEntity.POSITION_TYPE_ALL == entrustOrderEntity.getPositionType()) {
+                CalculateUtil.getForceSetPriceForWhole(entrustOrderEntity.getSymbol(), memberEntity);
+            }
             return Result.ok(MessageSourceUtils.getString("cancellation_success"));
         }
         return Result.fail(MessageSourceUtils.getString("cancellation_fail"));

--
Gitblit v1.9.1