diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/fail/fail.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/fail/fail.html index a2a8e1214..fc979ce92 100644 --- a/ruoyi-admin/src/main/resources/templates/trx2Energy/fail/fail.html +++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/fail/fail.html @@ -94,15 +94,22 @@ }, { field: 'fromAddress', - title: '转出账户' + title: '转出账户', + formatter: function (value, row, index) { + return "" + value + ""; + } }, { field: 'toAddress', - title: '转入账户' + title: '转入账户', + formatter: function (value, row, index) { + return "" + value + ""; + } }, { field: 'accountAddress', - title: '实际出账账户' + title: '实际出账账户', + visible: false }, { field: 'price', @@ -110,7 +117,11 @@ }, { field: 'trxTxId', - title: '订单hash' + title: '订单hash', + formatter: function (value, row, index) { + return "" + value + ""; + }, + visible: false }, { field: 'tranferCount', @@ -172,7 +183,14 @@ formatter: function(value, row, index) { return $.table.selectDictLabel(calcRuleDatas, value); } - }/*, + } , { + field: 'createTime', + title: '创建时间' + }, + { + field: 'updateTime', + title: '更新时间' + }/*, { title: '操作', align: 'center', diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GetSmsDetailTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GetSmsDetailTask.java index 25b50193f..25c2bc96d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GetSmsDetailTask.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GetSmsDetailTask.java @@ -1,5 +1,6 @@ package com.ruoyi.quartz.task; +import cn.hutool.core.collection.CollectionUtil; import com.ruoyi.common.core.domain.entity.SmsTaskTbl; import com.ruoyi.system.handler.GetSmsDetailTaskHandler; import com.ruoyi.system.mapper.SmsTaskTblMapper; @@ -19,6 +20,9 @@ public class GetSmsDetailTask { public void doGetSmsDetailTask() { List smsTaskTblList = smsTaskTblMapper.selectSmsTaskTblListNotComplete(); + if(CollectionUtil.isEmpty(smsTaskTblList)){ + return; + } getSmsDetailTaskHandler.doGetSmsDetailTask(smsTaskTblList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java b/ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java index 30829b0be..41a52c862 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java @@ -377,8 +377,8 @@ public class TRX2EneryTransferHandler { Object cacheidTrxExchangeFail = redisTemplate.opsForValue().get("transfer_trx_fail_" + txID); if (cacheidTrxExchangeFail == null){ TrxExchangeFail trxExchangeFail = new TrxExchangeFail(); - trxExchangeFail.setFromAddress(ownerAddress); - trxExchangeFail.setToAddress(toAddress); + trxExchangeFail.setFromAddress(AddressUtil.hexToBase58(ownerAddress)); + trxExchangeFail.setToAddress(AddressUtil.hexToBase58(toAddress)); trxExchangeFail.setAccountAddress(accountAddress); trxExchangeFail.setPrice(price); trxExchangeFail.setTrxTxId(txID); @@ -427,6 +427,7 @@ public class TRX2EneryTransferHandler { TrxExchangeFail trxExchangeFail = new TrxExchangeFail(); trxExchangeFail.setIdTrxExchangeFail(Long.valueOf(cacheidTrxExchangeFail.toString())); trxExchangeFail.setDelegateStatus("1"); + trxExchangeFail.setUpdateTime(new Date()); trxExchangeFailMapper.updateTrxExchangeFail(trxExchangeFail); redisTemplate.delete("transfer_trx_fail_" + txID); } @@ -461,6 +462,8 @@ public class TRX2EneryTransferHandler { } + + private long getBalance(Response.AccountResourceMessage accountResource, long transferCount, String resourceCode) { Long balance = null; if (resourceCode.equals(Common.ResourceCode.ENERGY.name())) {