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

FIX 解决笔数套餐重复发起没有校验的问题

pull/520/head
dorion 2024-08-15 21:13:41 +08:00
parent 5db0c4e4b9
commit 49b1f3a228
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MonitorTimerTaskStatusTask.java
View File

@ -5,15 +5,13 @@ import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.google.common.base.Preconditions;
import com.ruoyi.common.core.domain.entity.AccountAddressInfo;
import com.ruoyi.common.core.domain.entity.ErrorLog;
import com.ruoyi.common.core.domain.entity.TenantInfo;
import com.ruoyi.common.core.domain.entity.TrxExchangeFail;
import com.ruoyi.common.core.domain.entity.*;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.quartz.domain.SysJob;
import com.ruoyi.quartz.domain.SysJobLog;
import com.ruoyi.quartz.service.ISysJobLogService;
import com.ruoyi.quartz.service.ISysJobService;
import com.ruoyi.system.domain.vo.TrxExchangeInfoVO;
import com.ruoyi.system.handler.EnergyTenantTransferHandler;
import com.ruoyi.system.mapper.AccountAddressInfoMapper;
import com.ruoyi.system.mapper.TenantInfoMapper;
@ -21,6 +19,7 @@ import com.ruoyi.system.mapper.TrxExchangeFailMapper;
import com.ruoyi.system.service.IErrorLogService;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ITenantInfoService;
import com.ruoyi.system.service.ITrxExchangeInfoService;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
@ -56,6 +55,8 @@ public class MonitorTimerTaskStatusTask {
private RedisTemplate redisTemplate;
@Autowired
private RedissonClient redissonClient;
@Autowired
private ITrxExchangeInfoService trxExchangeInfoService;
public void doMonitorTimerTaskStatus() {
@ -79,6 +80,23 @@ public class MonitorTimerTaskStatusTask {
for (TenantInfo tenantInfo : tenantInfoList) {
try {
if ("N".equals(tenantInfo.getIsPaid())) {
continue;
}
String dictValue = DictUtils.getDictValue("sys_delegate_status", "已委托");
TrxExchangeInfo trxExchangeInfo = TrxExchangeInfo.builder().fromAddress(tenantInfo.getReceiverAddress())
.delegateStatus(dictValue)
.energyBusiType(tenantInfo.getEnergyBusiType())
.build();
List<TrxExchangeInfoVO> trxExchangeInfos = trxExchangeInfoService.selectTrxExchangeInfoList(trxExchangeInfo);
if ( CollectionUtil.isNotEmpty(trxExchangeInfos)){
continue;
}
Preconditions.checkState(CollectionUtil.isEmpty(trxExchangeInfos), "该接收能量地址已在任务中,请勿重复发起");
tenantInfoService.doDelegateEnergy(tenantInfo, "system", accountAddress, null);
tenantInfo.setTotalCountUsed(tenantInfo.getTotalCountUsed() + 1);
tenantInfo.setLcd(new Date());

4
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TenantInfoServiceImpl.java
View File

@ -184,10 +184,10 @@ public class TenantInfoServiceImpl implements ITenantInfoService {
Preconditions.checkState(status.equals(tenantInfo.getStatus()), "该租户不是生效中状态,不能发起委托任务");
String dictValue = DictUtils.getDictValue("sys_delegate_status", "已委托");
String sysEnergyBusiType = DictUtils.getDictValue("sys_energy_busi_type", "天数套餐");
// String sysEnergyBusiType = DictUtils.getDictValue("sys_energy_busi_type", "天数套餐");
TrxExchangeInfo trxExchangeInfo = TrxExchangeInfo.builder().fromAddress(tenantInfo.getReceiverAddress())
.delegateStatus(dictValue)
.energyBusiType(sysEnergyBusiType)
.energyBusiType(tenantInfo.getEnergyBusiType())
.build();
List<TrxExchangeInfoVO> trxExchangeInfos = trxExchangeInfoService.selectTrxExchangeInfoList(trxExchangeInfo);