mirror of https://gitee.com/y_project/RuoYi.git
修复失败记录地址没有转码功能
parent
3ae5fa0dc6
commit
2608ec67ae
|
@ -94,15 +94,22 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'fromAddress',
|
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',
|
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',
|
field: 'accountAddress',
|
||||||
title: '实际出账账户'
|
title: '实际出账账户',
|
||||||
|
visible: false
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'price',
|
field: 'price',
|
||||||
|
@ -110,7 +117,11 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
field: 'trxTxId',
|
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',
|
field: 'tranferCount',
|
||||||
|
@ -172,6 +183,13 @@
|
||||||
formatter: function(value, row, index) {
|
formatter: function(value, row, index) {
|
||||||
return $.table.selectDictLabel(calcRuleDatas, value);
|
return $.table.selectDictLabel(calcRuleDatas, value);
|
||||||
}
|
}
|
||||||
|
} , {
|
||||||
|
field: 'createTime',
|
||||||
|
title: '创建时间'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
field: 'updateTime',
|
||||||
|
title: '更新时间'
|
||||||
}/*,
|
}/*,
|
||||||
{
|
{
|
||||||
title: '操作',
|
title: '操作',
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.ruoyi.quartz.task;
|
package com.ruoyi.quartz.task;
|
||||||
|
|
||||||
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import com.ruoyi.common.core.domain.entity.SmsTaskTbl;
|
import com.ruoyi.common.core.domain.entity.SmsTaskTbl;
|
||||||
import com.ruoyi.system.handler.GetSmsDetailTaskHandler;
|
import com.ruoyi.system.handler.GetSmsDetailTaskHandler;
|
||||||
import com.ruoyi.system.mapper.SmsTaskTblMapper;
|
import com.ruoyi.system.mapper.SmsTaskTblMapper;
|
||||||
|
@ -19,6 +20,9 @@ public class GetSmsDetailTask {
|
||||||
public void doGetSmsDetailTask() {
|
public void doGetSmsDetailTask() {
|
||||||
List<SmsTaskTbl> smsTaskTblList = smsTaskTblMapper.selectSmsTaskTblListNotComplete();
|
List<SmsTaskTbl> smsTaskTblList = smsTaskTblMapper.selectSmsTaskTblListNotComplete();
|
||||||
|
|
||||||
|
if(CollectionUtil.isEmpty(smsTaskTblList)){
|
||||||
|
return;
|
||||||
|
}
|
||||||
getSmsDetailTaskHandler.doGetSmsDetailTask(smsTaskTblList);
|
getSmsDetailTaskHandler.doGetSmsDetailTask(smsTaskTblList);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -377,8 +377,8 @@ public class TRX2EneryTransferHandler {
|
||||||
Object cacheidTrxExchangeFail = redisTemplate.opsForValue().get("transfer_trx_fail_" + txID);
|
Object cacheidTrxExchangeFail = redisTemplate.opsForValue().get("transfer_trx_fail_" + txID);
|
||||||
if (cacheidTrxExchangeFail == null){
|
if (cacheidTrxExchangeFail == null){
|
||||||
TrxExchangeFail trxExchangeFail = new TrxExchangeFail();
|
TrxExchangeFail trxExchangeFail = new TrxExchangeFail();
|
||||||
trxExchangeFail.setFromAddress(ownerAddress);
|
trxExchangeFail.setFromAddress(AddressUtil.hexToBase58(ownerAddress));
|
||||||
trxExchangeFail.setToAddress(toAddress);
|
trxExchangeFail.setToAddress(AddressUtil.hexToBase58(toAddress));
|
||||||
trxExchangeFail.setAccountAddress(accountAddress);
|
trxExchangeFail.setAccountAddress(accountAddress);
|
||||||
trxExchangeFail.setPrice(price);
|
trxExchangeFail.setPrice(price);
|
||||||
trxExchangeFail.setTrxTxId(txID);
|
trxExchangeFail.setTrxTxId(txID);
|
||||||
|
@ -427,6 +427,7 @@ public class TRX2EneryTransferHandler {
|
||||||
TrxExchangeFail trxExchangeFail = new TrxExchangeFail();
|
TrxExchangeFail trxExchangeFail = new TrxExchangeFail();
|
||||||
trxExchangeFail.setIdTrxExchangeFail(Long.valueOf(cacheidTrxExchangeFail.toString()));
|
trxExchangeFail.setIdTrxExchangeFail(Long.valueOf(cacheidTrxExchangeFail.toString()));
|
||||||
trxExchangeFail.setDelegateStatus("1");
|
trxExchangeFail.setDelegateStatus("1");
|
||||||
|
trxExchangeFail.setUpdateTime(new Date());
|
||||||
trxExchangeFailMapper.updateTrxExchangeFail(trxExchangeFail);
|
trxExchangeFailMapper.updateTrxExchangeFail(trxExchangeFail);
|
||||||
redisTemplate.delete("transfer_trx_fail_" + txID);
|
redisTemplate.delete("transfer_trx_fail_" + txID);
|
||||||
}
|
}
|
||||||
|
@ -461,6 +462,8 @@ public class TRX2EneryTransferHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private long getBalance(Response.AccountResourceMessage accountResource, long transferCount, String resourceCode) {
|
private long getBalance(Response.AccountResourceMessage accountResource, long transferCount, String resourceCode) {
|
||||||
Long balance = null;
|
Long balance = null;
|
||||||
if (resourceCode.equals(Common.ResourceCode.ENERGY.name())) {
|
if (resourceCode.equals(Common.ResourceCode.ENERGY.name())) {
|
||||||
|
|
Loading…
Reference in New Issue