github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'refs/heads/feeen-1.15.3' into feeen-1.16.0 

# Conflicts:
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java
#	ruoyi-system/src/main/java/com/ruoyi/system/handler/EnergyTenantTransferHandler.java
pull/520/head
dorion 2024-06-28 21:46:18 +08:00
parent 3ee21d9e42 ad12f1abb4
commit 1e43bf254b
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java
View File

@ -36,7 +36,7 @@ public class UndelegateEnergyTask {
TrxExchangeInfo trxExchangeInfoExample = TrxExchangeInfo.builder() TrxExchangeInfo trxExchangeInfoExample = TrxExchangeInfo.builder()
.delegateStatus(dictValue) .delegateStatus(dictValue)
// .fcd(DateUtil.offsetDay(new Date(),-2)) .fcd(DateUtil.offsetDay(new Date(),-2))
.build(); .build();
List<TrxExchangeMonitorAccountInfo> trxExchangeMonitorAccountInfoList = trxExchangeInfoService.selectTrxExchangeMonitorAccountInfo(trxExchangeInfoExample); List<TrxExchangeMonitorAccountInfo> trxExchangeMonitorAccountInfoList = trxExchangeInfoService.selectTrxExchangeMonitorAccountInfo(trxExchangeInfoExample);

3
ruoyi-system/src/main/java/com/ruoyi/system/bot/TgLongPollingBot.java
View File

@ -4,11 +4,12 @@ import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.bots.TelegramLongPollingBot;
import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.api.objects.Update;
import org.telegram.telegrambots.meta.exceptions.TelegramApiException; import org.telegram.telegrambots.meta.exceptions.TelegramApiException;
//@Component @Component
@Slf4j @Slf4j
public class TgLongPollingBot extends TelegramLongPollingBot { public class TgLongPollingBot extends TelegramLongPollingBot {

4
ruoyi-system/src/main/java/com/ruoyi/system/handler/EnergyTenantTransferHandler.java
View File

@ -60,7 +60,7 @@ public class EnergyTenantTransferHandler {
List<TrxExchangeMonitorAccountInfo> trxExchangeMonitorAccountInfoList = trxExchangeInfoMapper.selectTrxExchangeMonitorAccountInfo(trxExchangeInfo); List<TrxExchangeMonitorAccountInfo> trxExchangeMonitorAccountInfoList = trxExchangeInfoMapper.selectTrxExchangeMonitorAccountInfo(trxExchangeInfo);
if (between > period) { if (between + 1 > period) {
String apiKey = DictUtils.getRandomDictValue("sys_tron_api_key"); String apiKey = DictUtils.getRandomDictValue("sys_tron_api_key");
@ -146,7 +146,7 @@ public class EnergyTenantTransferHandler {
.fromAddress(tenantInfo.getReceiverAddress()) .fromAddress(tenantInfo.getReceiverAddress())
.delegateStatus(delegateStatus) .delegateStatus(delegateStatus)
.energyBusiType(eneryBusiTypeByDay) .energyBusiType(eneryBusiTypeByDay)
// .fcd(DateUtil.offsetDay(new Date(), -2)) .fcd(DateUtil.offsetDay(new Date(), -30))
.build(); .build();
return trxExchangeInfo; return trxExchangeInfo;
} }