From 74ca5bc0f40e3b91464c8972392271d24dd5f066 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Mon, 14 Sep 2020 11:05:48 +0800
Subject: [PATCH] 撮合交易代码提交

---
 src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java b/src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java
index 7add4f8..e61a588 100644
--- a/src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java
@@ -39,10 +39,14 @@
         CoinProcessor processor = processorFactory.getProcessor(symbol);
         Map<String, Candlestick> currentKlineMap = processor.getCurrentKlineMap();
         Collection<Candlestick> values = currentKlineMap.values();
-        BigDecimal newPrice = trades.get(trades.size()-1).getPrice();
+        BigDecimal newPrice =null;
         for (Candlestick candlestick : values) {
             for (ExchangeTrade exchangeTrade : trades) {
+                if(exchangeTrade==null){
+                    continue;
+                }
                 processor.processTrade(candlestick, exchangeTrade);
+                newPrice=exchangeTrade.getPrice();
             }
         }
 
@@ -51,6 +55,9 @@
         key = StrUtil.format(key, symbolUsdt);
         redisUtils.set(key,currentKlineMap);
         // 更新最新价
-        redisUtils.set(CoinTypeConvert.convertToKey(symbolUsdt), newPrice);
+        if(newPrice!=null){
+            redisUtils.set(CoinTypeConvert.convertToKey(symbolUsdt), newPrice);
+        }
+
     }
 }

--
Gitblit v1.9.1