From 36be00e0f3cbe0d559c646fd2977e6e3a74aa6f9 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:57:22 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea

---
 src/main/java/com/xcong/excoin/modules/exchange/service/impl/HandleKlineServiceImpl.java |   10 ++++++++--
 1 files changed, 8 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 4fd7abd..ec776b7 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
@@ -57,13 +57,18 @@
             if(exchangeTrade==null){
                 continue;
             }
-            min=exchangeTrade.getPrice().min(min);
+            if(min.compareTo(BigDecimal.ZERO)==0){
+                min = exchangeTrade.getPrice();
+            }else{
+                min=exchangeTrade.getPrice().min(min);
+            }
             max=exchangeTrade.getPrice().max(max);
             vol=vol.add(exchangeTrade.getAmount());
         }
         Object o = redisUtils.get(symbolUsdt);
         if(o!=null){
             Candlestick today =   (Candlestick)o;
+            today.setVolume(today.getVolume()==null?BigDecimal.ZERO:today.getVolume());
             today.setHigh(today.getHigh().max(max));
             today.setLow(today.getLow().min(min));
             today.setVolume(today.getVolume().add(vol));
@@ -73,9 +78,10 @@
             today.setClose(newPrice);
             today.setLow(newPrice);
             today.setHigh(newPrice);
+            today.setVolume(BigDecimal.ZERO);
             today.setHigh(today.getHigh().max(max));
             today.setLow(today.getLow().min(min));
-            today.setLow(vol);
+            today.setVolume(vol);
             redisUtils.set(symbolUsdt,today);
         }
         // 存入redis,websocket去取

--
Gitblit v1.9.1