From 4801d78ba76a041bd6e14051f7fee1c8fe0d7ba2 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 08 Sep 2020 17:46:31 +0800
Subject: [PATCH] modify

---
 src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
index 5d90b5e..02968a9 100644
--- a/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
+++ b/src/main/java/com/xcong/excoin/rabbit/pricequeue/WebsocketPriceService.java
@@ -1,6 +1,7 @@
 package com.xcong.excoin.rabbit.pricequeue;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.xcong.excoin.common.contants.AppContants;
@@ -290,13 +291,11 @@
 
                 if (CollUtil.isNotEmpty(holdOrderEntities)) {
                     BigDecimal totalProfitOrLess = BigDecimal.ZERO;
-                    String currentPrice = null;
+                    Map<String, Object> priceMap = new HashMap<>();
                     for (ContractHoldOrderEntity holdOrderEntity : holdOrderEntities) {
-                        if (symbol.equalsIgnoreCase(holdOrderEntity.getSymbol())) {
-                            currentPrice = price;
-                        } else {
-                            currentPrice = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
-                        }
+                        String currentPrice = redisUtils.getString(CoinTypeConvert.convertToKey(holdOrderEntity.getSymbol()));
+                        priceMap.put(holdOrderEntity.getSymbol(), currentPrice);
+
                         BigDecimal lotNumber = cacheSettingUtils.getSymbolSku(holdOrderEntity.getSymbol());
                         BigDecimal profitOrLess = CalculateUtil.calOrderProfitOrLess(holdOrderEntity.getOpeningType(), new BigDecimal(currentPrice), holdOrderEntity.getOpeningPrice(), lotNumber, holdOrderEntity.getSymbolCntSale(), memberEntity.getIsProfit());
                         totalProfitOrLess = totalProfitOrLess.add(profitOrLess);
@@ -312,12 +311,12 @@
                         String content = JSONObject.toJSONString(list);
 
                         String key = AppContants.WHOLE_BOMB_PREFIX + memberId;
-                        String value = redisUtils.getString(key);
-                        if (StrUtil.isBlank(value)) {
+                        Map<Object, Object> value = redisUtils.hmget(key);
+                        if (MapUtil.isEmpty(value)) {
                             orderProducer.sendWholeBomb(content);
                             contractHoldOrderDao.updateMemberAllHoldOrderClosingStatus(memberId);
 
-                            redisUtils.set(key, memberId);
+                            redisUtils.hmset(key, priceMap);
                         }
                     }
                 }

--
Gitblit v1.9.1