From 292a4634d9c52ce193eca9de356d65960bdc35f4 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 15 Jan 2021 18:20:37 +0800
Subject: [PATCH] 20210115

---
 src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
index 9d4215c..e5ed3a4 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
@@ -10,6 +10,7 @@
 import com.xcong.excoin.modules.coin.dao.OrderCoinsDao;
 import com.xcong.excoin.modules.coin.entity.OrderCoinsEntity;
 import com.xcong.excoin.modules.coin.service.OrderCoinService;
+import com.xcong.excoin.modules.symbols.constants.SymbolsConstats;
 import com.xcong.excoin.modules.symbols.service.SymbolsService;
 import com.xcong.excoin.processor.CoinProcessor;
 import com.xcong.excoin.processor.CoinProcessorFactory;
@@ -43,7 +44,7 @@
  **/
 @Slf4j
 @Component
-//@ConditionalOnProperty(prefix = "app", name = "trade", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "exchange-trade", havingValue = "true")
 public class CoinTradeInitJob {
 
     @Resource
@@ -69,7 +70,7 @@
     @PostConstruct
     public void initCoinTrade() {
         log.info("#=======撮合交易器开启=======#");
-        String symbol = "NEKK";
+        String symbol = SymbolsConstats.RFNC;
         CoinTrader newTrader = new CoinTrader(symbol);
         newTrader.setExchangeProducer(exchangeProducer);
         //newTrader.setKafkaTemplate(kafkaTemplate);
@@ -86,6 +87,12 @@
         List<OrderCoinsEntity> tradingOrders = new ArrayList<>();
         List<OrderCoinsEntity> completedOrders = new ArrayList<>();
         orders.forEach(order -> {
+            if(order.getDealCnt()==null){
+                order.setDealCnt(BigDecimal.ZERO);
+            }
+            if(order.getDealAmount()==null){
+                order.setDealAmount(BigDecimal.ZERO);
+            }
             tradingOrders.add(order);
         });
         try {
@@ -100,11 +107,12 @@
         // 创建K线生成器
         CoinProcessor processor = new DefaultCoinProcessor(symbol, "USDT");
         processor.setMarketService(marketService);
+        processor.setRedisUtils(redisUtils);
         //processor.setExchangeRate(exchangeRate);
         processor.initializeThumb();
         //processor.initializeUsdRate();
         processor.setIsHalt(false);
-        List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime("NEKK", null, null);
+        List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime(SymbolsConstats.RFNC, null, null);
         processor.process(nekk);
         String symbolUsdt = symbol;
         if(!symbol.contains("USDT")){

--
Gitblit v1.9.1