From 436f7fa4d6ec2dee3b0c859ea7b7eef2369437ca Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 12 May 2021 17:27:19 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java | 7 +++----
src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java | 15 +++++++++++++++
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
index d1f0637..85e7379 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
@@ -50,12 +50,11 @@
symbol = CoinTypeConvert.convert(symbol);
if (null != symbol) {
String price = tradeEvent.getTradeList().get(0).getPrice().toPlainString();
- // TODO 测试环境关闭这个插入redis
redisUtils.set(CoinTypeConvert.convertToKey(symbol), price);
// 比较
- websocketPriceService.comparePriceAsc(symbol, price);
- websocketPriceService.comparePriceDesc(symbol, price);
- websocketPriceService.wholeBomb();
+// websocketPriceService.comparePriceAsc(symbol, price);
+// websocketPriceService.comparePriceDesc(symbol, price);
+// websocketPriceService.wholeBomb();
//System.out.println("比较完毕:"+symbol+"-"+price);
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
index 098260b..a8c87dc 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.xcong.excoin.modules.yunding.dao.YdBasicSettingDao;
import com.xcong.excoin.modules.yunding.entity.YdBasicSettingEntity;
+import com.xcong.excoin.modules.yunding.service.XchProfitService;
import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@
private YdBasicSettingDao ydBasicSettingDao;
@Autowired
private RedisUtils redisUtils;
+ @Autowired
+ private XchProfitService xchProfitService;
@Scheduled(cron = "* */1 * * * ? ")
public void baseDataUpdate() {
@@ -90,4 +93,16 @@
return result;
}
+
+// @Scheduled(cron = "0 0 23 * * ?")
+ public void xchProfitJob() {
+ log.info("XCH收益返利任务");
+// xchProfitService.xchProfitDistributor();
+ }
+
+// @Scheduled(cron = "0 0 22 * * ?")
+ public void usdtProfitJob() {
+ log.info("USDT返利任务");
+ xchProfitService.agentUsdtProfitDistributor();
+ }
}
--
Gitblit v1.9.1