From c576b9f8f6a49a1efb27e5e7d1e09fc5f2336796 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 02 Dec 2020 17:58:44 +0800 Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin.git into outcenter --- src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 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 2b8c6cb..1b365c6 100644 --- a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java +++ b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java @@ -70,7 +70,7 @@ @PostConstruct public void initCoinTrade() { log.info("#=======撮合交易器开启=======#"); - String symbol = SymbolsConstats.ROC; + String symbol = SymbolsConstats.SER; CoinTrader newTrader = new CoinTrader(symbol); newTrader.setExchangeProducer(exchangeProducer); //newTrader.setKafkaTemplate(kafkaTemplate); @@ -87,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 { @@ -106,7 +112,7 @@ processor.initializeThumb(); //processor.initializeUsdRate(); processor.setIsHalt(false); - List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime(SymbolsConstats.ROC, null, null); + List<ExchangeTrade> nekk = orderCoinDealDao.selectOrderCoinDealByTime(SymbolsConstats.SER, null, null); processor.process(nekk); String symbolUsdt = symbol; if(!symbol.contains("USDT")){ -- Gitblit v1.9.1