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 | 13 ++++++++++---
1 files changed, 10 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 6f114b0..1b365c6 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
@@ -44,7 +44,7 @@
**/
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "trade", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "exchange-trade", havingValue = "true")
public class CoinTradeInitJob {
@Resource
@@ -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 {
@@ -101,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(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