From d06ef42904752c43a8a2458ce38793b50442ab2c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 25 Aug 2020 18:14:28 +0800
Subject: [PATCH] modify cancel entrust order

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    4 ++--
 1 files changed, 2 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 48a7aec..c71a59c 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
@@ -261,7 +261,7 @@
 
         MemberEntity memberEntity = memberDao.selectById(holdOrderEntity.getMemberId());
 
-        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeEnum.USDT.name());
+        MemberWalletContractEntity walletContract = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(holdOrderEntity.getMemberId(), CoinTypeConvert.convertContractTypeToCoin(symbol));
         if (walletContract != null) {
             BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(symbol);
             // 盈亏
@@ -329,7 +329,7 @@
                 contractHoldOrderDao.deleteById(holdOrderEntity.getId());
             }
 
-            BigDecimal changeAmount = profitOrLoss.add(bondAmount).subtract(fee);
+            BigDecimal changeAmount = profitOrLoss.add(bondAmount);
 
             memberWalletContractDao.increaseWalletContractBalanceById(changeAmount, profitOrLoss.subtract(fee), null, walletContract.getId());
 

--
Gitblit v1.9.1