From 5f4ba658bd9f091fe2b17cc82644e761aaf49ebf Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 26 Aug 2020 11:05:11 +0800
Subject: [PATCH] add entrust close queue

---
 src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java |    5 +++--
 1 files changed, 3 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..8cfa416 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);
             // 盈亏
@@ -324,12 +324,13 @@
 
             if (holdOrderEntity.getSymbolCntSale() != 0) {
                 holdOrderEntity.setOpeningFeeAmount(holdOrderEntity.getOpeningFeeAmount().subtract(fee));
+                holdOrderEntity.setBondAmount(holdOrderEntity.getBondAmount().subtract(bondAmount));
                 contractHoldOrderDao.updateById(holdOrderEntity);
             } else {
                 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