From 93f666908b8b84336aed251a1cc22b49b5c4b12f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 29 Jan 2021 17:25:48 +0800
Subject: [PATCH] Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new

---
 src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
index 357df80..ca987b9 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/OrderOperatePriceService.java
@@ -151,6 +151,8 @@
      * @param memberId
      */
     public static void wholePriceDataOperation(Long memberId) {
+        Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
+        log.info("操作前:{}", dataModelMap);
         RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class);
 
         ContractHoldOrderDao contractHoldOrderDao = SpringContextHolder.getBean(ContractHoldOrderDao.class);
@@ -159,7 +161,14 @@
         MemberWalletContractDao memberWalletContractDao = SpringContextHolder.getBean(MemberWalletContractDao.class);
 
         List<ContractHoldOrderEntity> holdOrders = contractHoldOrderDao.selectHoldOrderListByMemberId(memberId);
+        log.info("持仓数量:{}", holdOrders.size());
         if (CollUtil.isEmpty(holdOrders)) {
+            if (dataModelMap.get(memberId.toString()) != null) {
+                log.info("平仓后执行");
+                dataModelMap.remove(memberId.toString());
+
+                redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+            }
             return;
         }
 
@@ -187,10 +196,9 @@
         wholePriceData.setBalance(wallet.getTotalBalance().subtract(totalAmount));
         wholePriceData.setMemberId(memberId);
 
-        Map<String, WholePriceDataModel> dataModelMap = WholeDataQueue.MAP;
         dataModelMap.put(wholePriceData.getMemberId().toString(), wholePriceData);
-
         redisUtils.set(AppContants.WHOLE_BOMB_MAP, JSONObject.toJSONString(dataModelMap));
+        log.info("dataModelMap为:{}", dataModelMap);
     }
 
 }

--
Gitblit v1.9.1