From 2383ba4c69409ffe6d0d8fcf4e5102de5dc97085 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 28 Jan 2021 19:24:02 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
index f31295b..de3abb7 100644
--- a/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
+++ b/src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java
@@ -4,8 +4,10 @@
 import com.alibaba.fastjson.JSONObject;
 import com.xcong.excoin.common.contants.AppContants;
 import com.xcong.excoin.common.enumerates.CoinTypeEnum;
+import com.xcong.excoin.modules.contract.dao.ContractEntrustOrderDao;
 import com.xcong.excoin.modules.contract.dao.ContractHoldOrderDao;
 import com.xcong.excoin.modules.contract.dao.ContractOrderDao;
+import com.xcong.excoin.modules.contract.entity.ContractEntrustOrderEntity;
 import com.xcong.excoin.modules.contract.entity.ContractHoldOrderEntity;
 import com.xcong.excoin.modules.contract.entity.ContractOrderEntity;
 import com.xcong.excoin.modules.contract.mapper.ContractHoldOrderEntityMapper;
@@ -111,6 +113,7 @@
             public void run() {
                 log.info("全仓操作价格");
                 ContractHoldOrderDao contractHoldOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
+                ContractEntrustOrderDao contractEntrustOrderDao = SpringContextHolder.getBean(ContractEntrustOrderDao.class);
                 RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
                 MemberWalletContractDao memberWalletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
 
@@ -130,7 +133,16 @@
                 }
 
                 wholePriceData.setHoldBond(totalHoldBond);
-                wholePriceData.setBalance(wallet.getTotalBalance());
+
+                List<ContractEntrustOrderEntity> entrustOrder = contractEntrustOrderDao.selectEntrustOrderListByMemberId(wholePriceData.getMemberId());
+                BigDecimal totalAmount = BigDecimal.ZERO;
+                if (CollUtil.isNotEmpty(entrustOrder)) {
+                    for (ContractEntrustOrderEntity contractEntrustOrderEntity : entrustOrder) {
+                        totalAmount.add(contractEntrustOrderEntity.getEntrustAmount());
+                    }
+                }
+
+                wholePriceData.setBalance(wallet.getTotalBalance().subtract(totalAmount));
                 wholePriceData.setMemberId(memberId);
 
                 OrderProducer orderProducer = SpringContextHolder.getBean(OrderProducer.class);

--
Gitblit v1.9.1