From 0b10fd71ce7a6c32b70eef96f0ceb5a516306d6b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 15:05:01 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/XchTest.java | 37 ++++++++++++++++++
src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java | 4 +-
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 39 +++++++++----------
src/main/resources/application.yml | 2
4 files changed, 59 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
index 3dc38f1..ea55732 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -167,23 +167,23 @@
List<String> inviteIds = StrUtil.split(memberEntity.getRefererIds(), ',');
List<MemberEntity> agents = memberDao.selectYdParentAgent(inviteIds);
- if (CollUtil.isNotEmpty(agents)) {
- Map<Long, BigDecimal> returnRatio = buildReturnRatioObj(agents, 1);
-
- for (Map.Entry<Long, BigDecimal> entry : returnRatio.entrySet()) {
- String conent = "USDT返利";
- BigDecimal amount = order.getAmount().multiply(entry.getValue());
- LogRecordUtils.insertMemberAccountMoneyChangeWithId(entry.getKey(), conent, amount, "USDT", 1, 6, order.getId());
- MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(entry.getKey(), "USDT");
-
- memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), amount, BigDecimal.ZERO, 0);
- }
-
- YdOrderEntity updateOrder = new YdOrderEntity();
- updateOrder.setReturnState(2);
- updateOrder.setId(order.getId());
- ydOrderDao.updateById(updateOrder);
- }
+// if (CollUtil.isNotEmpty(agents)) {
+// Map<Long, BigDecimal> returnRatio = buildReturnRatioObj(agents, 1);
+//
+// for (Map.Entry<Long, BigDecimal> entry : returnRatio.entrySet()) {
+// String conent = "USDT返利";
+// BigDecimal amount = order.getAmount().multiply(entry.getValue());
+// LogRecordUtils.insertMemberAccountMoneyChangeWithId(entry.getKey(), conent, amount, "USDT", 1, 6, order.getId());
+// MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(entry.getKey(), "USDT");
+//
+// memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), amount, BigDecimal.ZERO, 0);
+// }
+//
+// YdOrderEntity updateOrder = new YdOrderEntity();
+// updateOrder.setReturnState(2);
+// updateOrder.setId(order.getId());
+// ydOrderDao.updateById(updateOrder);
+// }
// 合伙人分红
List<MemberEntity> partners = memberDao.selectPartnerMemberList();
@@ -194,9 +194,8 @@
for (MemberEntity partner : partners) {
String conent = "合伙人USDT分红";
LogRecordUtils.insertMemberAccountMoneyChangeWithId(partner.getId(), conent, returnAmount, "USDT", 1, 9, order.getId());
- MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(partner.getId(), "USDT");
-
- memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), returnAmount, BigDecimal.ZERO, 0);
+// MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(partner.getId(), "USDT");
+// memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), returnAmount, BigDecimal.ZERO, 0);
}
}
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 4df1ca4..1f48a33 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/XchBaseDataUpdateJob.java
@@ -38,8 +38,8 @@
@Autowired
private XchProfitService xchProfitService;
- @Scheduled(cron = "0 0 0/10 * * ? ")
-// @Scheduled(cron = "0 0/1 * * * ? ")
+// @Scheduled(cron = "0 0 0/10 * * ? ")
+ @Scheduled(cron = "0 0/1 * * * ? ")
public void baseDataUpdate() {
log.info("基础数据更新任务");
// 请求价格等数据
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index caf8860..33e655a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -107,7 +107,7 @@
loop-job: false
rabbit-consumer: false
block-job: false
- xch-job: false
+ xch-job: true
yunding-consumer: false
aliyun:
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index b3438a9..a0244e6 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -16,6 +16,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -97,4 +100,38 @@
coin.setPageSize(10);
coinService.coinInList(coin);
}
+
+ public static void main(String[] args) {
+ String s = execCurl("https://api2.chiaexplorer.com/blockchainSummary");
+ System.out.println(s);
+ }
+
+ private static String execCurl(String url) {
+ String[] cmds = {"curl", url
+ , "-H", "sec-ch-ua: \" Not A;Brand\";v=\"99\", \"Chromium\";v=\"90\", \"Google Chrome\";v=\"90\""
+ ,"-H", "Accept: application/json, text/plain, */*"
+ ,"-H", "Referer: https://www.chiaexplorer.com/"
+ ,"-H", "sec-ch-ua-mobile: ?0"
+ ,"-H", "User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36"
+ ," --compressed"};
+
+ ProcessBuilder process = new ProcessBuilder(cmds);
+ Process p;
+ try {
+ p = process.start();
+ BufferedReader reader = new BufferedReader(new InputStreamReader(p.getInputStream()));
+ StringBuilder builder = new StringBuilder();
+ String line;
+ while ((line = reader.readLine()) != null) {
+ builder.append(line);
+ builder.append(System.getProperty("line.separator"));
+ }
+ return builder.toString();
+
+ } catch (IOException e) {
+ System.out.print("error");
+ e.printStackTrace();
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1