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

修复失败记录地址没有转码功能

pull/520/head
dorion 2024-07-12 21:43:52 +08:00
parent 3ae5fa0dc6
commit 2608ec67ae
3 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ruoyi-admin/src/main/resources/templates/trx2Energy/fail/fail.html
View File

@ -94,15 +94,22 @@
},
{
field: 'fromAddress',
title: '转出账户'
title: '转出账户',
formatter: function (value, row, index) {
return "<a href='https://www.oklink.com/zh-hans/trx/address/" + value + "' target='_blank'>" + value + "</a>";
}
},
{
field: 'toAddress',
title: '转入账户'
title: '转入账户',
formatter: function (value, row, index) {
return "<a href='https://www.oklink.com/zh-hans/trx/address/" + value + "' target='_blank'>" + value + "</a>";
}
},
{
field: 'accountAddress',
title: '实际出账账户'
title: '实际出账账户',
visible: false
},
{
field: 'price',
@ -110,7 +117,11 @@
},
{
field: 'trxTxId',
title: '订单hash'
title: '订单hash',
formatter: function (value, row, index) {
return "<a href='https://www.oklink.com/zh-hans/trx/address/" + value + "' target='_blank'>" + value + "</a>";
},
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',

4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GetSmsDetailTask.java
View File

@ -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<SmsTaskTbl> smsTaskTblList = smsTaskTblMapper.selectSmsTaskTblListNotComplete();
if(CollectionUtil.isEmpty(smsTaskTblList)){
return;
}
getSmsDetailTaskHandler.doGetSmsDetailTask(smsTaskTblList);
}

7
ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java
View File

@ -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())) {