From fba9c1b49998de2933f80beb5bd1d841b587e3fb Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 29 Jan 2021 16:25:23 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin.git into whole_new

---
 src/main/java/com/xcong/excoin/utils/ThreadPoolUtils.java |   38 +++++---------------------------------
 1 files changed, 5 insertions(+), 33 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..dfc37dc 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;
@@ -106,38 +108,8 @@
      * @param memberId
      */
     public static void sendWholePrice(@NotNull Long memberId) {
-        EXECUTOR.execute(new Runnable() {
-            @Override
-            public void run() {
-                log.info("全仓操作价格");
-                ContractHoldOrderDao contractHoldOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
-                RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
-                MemberWalletContractDao memberWalletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
-
-                List<ContractHoldOrderEntity> holdOrders = contractHoldOrderDao.selectHoldOrderListByMemberId(memberId);
-                if (CollUtil.isEmpty(holdOrders)) {
-                    return;
-                }
-                MemberWalletContractEntity wallet = memberWalletContractDao.findWalletContractByMemberIdAndSymbol(memberId, CoinTypeEnum.USDT.name());
-
-                WholePriceDataModel wholePriceData = new WholePriceDataModel();
-                List<HoldOrderDataModel> holdOrderDataModels = ContractHoldOrderEntityMapper.INSTANCE.entitiesToDataModels(holdOrders);
-                wholePriceData.setList(holdOrderDataModels);
-
-                BigDecimal totalHoldBond = BigDecimal.ZERO;
-                for (ContractHoldOrderEntity holdOrder : holdOrders) {
-                    totalHoldBond = totalHoldBond.add(holdOrder.getHoldBond() == null ? BigDecimal.ZERO : holdOrder.getHoldBond());
-                }
-
-                wholePriceData.setHoldBond(totalHoldBond);
-                wholePriceData.setBalance(wallet.getTotalBalance());
-                wholePriceData.setMemberId(memberId);
-
-                OrderProducer orderProducer = SpringContextHolder.getBean(OrderProducer.class);
-
-                orderProducer.sendWholePrice(JSONObject.toJSONString(wholePriceData));
-            }
-        });
-
+        log.info("全仓操作价格");
+        OrderProducer orderProducer = SpringContextHolder.getBean(OrderProducer.class);
+        orderProducer.sendWholePrice(memberId.toString());
     }
 }

--
Gitblit v1.9.1