Merge branch 'refs/heads/feeen-1.18.3' into feeen-1.19.0

ruoyi-admin/src/main/resources/templates/trx2Energy/account/trx2Energy.html

@@ -104,10 +104,30 @@
                           title: '能量资源',
                       },{
                           field: 'totalFrozen',
-                          title: '抵押资产TRX',
+                          title: '在押资产',
+                          formatter: function (value, row, index) {
+                              // 确保值是一个数字
+                              if (!isNaN(value)) {
+                                  // 保留两位小数
+                                  return parseFloat(value).toFixed(2);
+                              } else {
+                                  // 如果值不是数字，直接返回原值
+                                  return value;
+                              }
+                          }
                       },{
                           field: 'trxBalance',
-                          title: 'TRX余额',
+                          title: '账户余额',
+                          formatter: function (value, row, index) {
+                              // 确保值是一个数字
+                              if (!isNaN(value)) {
+                                  // 保留两位小数
+                                  return parseFloat(value).toFixed(2);
+                              } else {
+                                  // 如果值不是数字，直接返回原值
+                                  return value;
+                              }
+                          }
                       },
                       {
                           field: 'fcd',

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

@@ -96,7 +96,8 @@
                     field: 'fromAddress',
                     title: '转出账户',
                     formatter: function (value, row, index) {
-                        return "<a href='https://www.oklink.com/zh-hans/trx/address/" + value + "' target='_blank'>" + value + "</a>";
+                        const maskedValue = value.replace(/^(.{6}).*(.{8})$/, '$1***$2');
+                        return "<a href='https://www.oklink.com/zh-hans/trx/address/" + value + "' target='_blank'>" + maskedValue + "</a>";
                     }
                 },
                 {
@@ -179,7 +180,7 @@
                 },
                 {
                     field: 'calcRule',
-                    title: '笔数计算规则',
+                    title: '能量规则',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(calcRuleDatas, value);
                     }

ruoyi-admin/src/main/resources/templates/trx2Energy/freeze/add.html

@@ -23,7 +23,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label">交换资源：</label>
+                <label class="col-sm-3 control-label">充值类型：</label>
                 <div class="col-sm-8">
                     <select class="form-control" name="exchangeResourceType" th:with="type=${@dict.getType('sys_trx_exchange')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>

ruoyi-admin/src/main/resources/templates/trx2Energy/freeze/freeze.html

@@ -20,7 +20,7 @@
                                 <input type="text" name="txId"/>
                             </li>
                             <li>
-                                <label>交换资源：</label>
+                                <label>充值类型：</label>
                                 <select class="form-control" name="exchangeResourceType" th:with="type=${@dict.getType('sys_trx_exchange')}">
                                     <option value="">所有</option>
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
@@ -87,18 +87,19 @@
                 },
                 {
                     field: 'freezeTrxAmount',
-                    title: '抵押金额TRX'
+                    title: '充值金额'
                 },
                 {
                     field: 'exchangeResourceType',
-                    title: '交换资源',
+                    title: '充值类型',
                     formatter: function(value, item, index) {
                         return $.table.selectDictLabel(datas, item.exchangeResourceType);
                     }
                 },
                 {
                     field: 'txId',
-                    title: '交易id'
+                    title: '交易id',
+                    visible: false
                 },
                     {
                         field: 'fcd',
@@ -118,18 +119,18 @@
                         field: 'lcu',
                         title: '更新用户',
                         visible: false
-                    },
+                    }/*,
 
                     {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        /*actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idFreezeBalanceInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');*/
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.idFreezeBalanceInfo + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.idFreezeBalanceInfo + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }
-                }]
+                }*/]
             };
             $.table.init(options);
         });

ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/monitor.html

@@ -122,7 +122,7 @@
                 },
                 {
                     field: 'trxBalance',
-                    title: 'TRX余额',
+                    title: '账户余额',
                     formatter: function (value, row, index) {
                         // 确保值是一个数字
                         if (!isNaN(value)) {

ruoyi-admin/src/main/resources/templates/usdt2Trx/account/usdt2Trx.html

@@ -104,10 +104,30 @@
                           title: '能量资源',
                       },{
                           field: 'totalFrozen',
-                          title: '抵押资产TRX',
+                          title: '在押资产',
+                          formatter: function (value, row, index) {
+                              // 确保值是一个数字
+                              if (!isNaN(value)) {
+                                  // 保留两位小数
+                                  return parseFloat(value).toFixed(2);
+                              } else {
+                                  // 如果值不是数字，直接返回原值
+                                  return value;
+                              }
+                          }
                       },{
                           field: 'trxBalance',
-                          title: 'TRX余额',
+                          title: '账户余额',
+                          formatter: function (value, row, index) {
+                              // 确保值是一个数字
+                              if (!isNaN(value)) {
+                                  // 保留两位小数
+                                  return parseFloat(value).toFixed(2);
+                              } else {
+                                  // 如果值不是数字，直接返回原值
+                                  return value;
+                              }
+                          }
                       },
                       {
                           field: 'fcd',

ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/monitor.html

@@ -109,7 +109,7 @@
                 },
                     {
                         field: 'trxBalance',
-                        title: 'TRX余额',
+                        title: '账户余额',
                         formatter: function (value, row, index) {
                             // 确保值是一个数字
                             if (!isNaN(value)) {

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/FreezeBalanceInfo.java

@@ -29,8 +29,8 @@ public class FreezeBalanceInfo extends BaseEntity
     @Excel(name = "抵押金额trx")
     private Long freezeTrxAmount;
 
-    /** 交换资源类型id */
+    /** 充值类型类型id */
-    @Excel(name = "交换资源")
+    @Excel(name = "充值类型")
     private String exchangeResourceType;
 
     /** 交易id */

ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/UndelegateEnergyTask.java

@@ -1,7 +1,6 @@
 package com.ruoyi.quartz.task;
 
 
-import cn.hutool.core.date.DateUtil;
 import com.ruoyi.common.core.domain.entity.TrxExchangeInfo;
 import com.ruoyi.common.utils.DictUtils;
 import com.ruoyi.system.domain.TrxExchangeMonitorAccountInfo;
@@ -12,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.Date;
 import java.util.List;
 
 @Component("undelegateEnergyTask")
@@ -36,7 +34,7 @@ public class UndelegateEnergyTask {
 
         TrxExchangeInfo trxExchangeInfoExample = TrxExchangeInfo.builder()
                                                         .delegateStatus(dictValue)
-                                                        .fcd(DateUtil.offsetDay(new Date(),-2))
+//                                                        .fcd(DateUtil.offsetDay(new Date(),-2))
                                                         .build();
 
         List<TrxExchangeMonitorAccountInfo> trxExchangeMonitorAccountInfoList = trxExchangeInfoService.selectTrxExchangeMonitorAccountInfo(trxExchangeInfoExample);

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MonitorAddressInfoVO.java

@@ -35,7 +35,7 @@ public class MonitorAddressInfoVO
     @Excel(name = "监听地址")
     private String monitorAddress;
 
-    @Excel(name = "TRX余额")
+    @Excel(name = "账户余额")
     private BigDecimal trxBalance;
 
 

ruoyi-system/src/main/java/com/ruoyi/system/handler/TRX2EneryTransferHandler.java

@@ -461,8 +461,8 @@ public class TRX2EneryTransferHandler {
                 arguments.put("trxAmount", amount == null ? "" : amount.toString());
                 arguments.put("price", price == null ? "" : price.toString());
                 arguments.put("transferCount", transferCount);
-                arguments.put("FromAddress", fromAddress.replaceAll("(.{6})(.*)(.{8})", "$1\\*\\*\\*\\*$3"));
+                arguments.put("FromAddress", fromAddress.replaceAll("(.{6})(.*)(.{8})", "$1\\\\*\\\\*\\\\*\\\\*$3"));
-                arguments.put("txId", StringUtils.isEmpty(txID) ? "" : txID.replaceAll("(.{6})(.*)(.{8})", "$1\\*\\*\\*\\*\\*\\*\\*\\*$3"));
+                arguments.put("txId", StringUtils.isEmpty(txID) ? "" : txID.replaceAll("(.{6})(.*)(.{8})", "$1\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*$3"));
                 arguments.put("txTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
 //            String message = MessageFormat.format(sysUsdtTranferNotice, arguments);
                 StrSubstitutor substitutor = new StrSubstitutor(arguments, "{", "}");

ruoyi-system/src/main/java/com/ruoyi/system/handler/Usdt2TrxTransferHandler.java

@@ -230,8 +230,8 @@ public class Usdt2TrxTransferHandler {
                 arguments.put("usdtAmount", transferValue.setScale(2, BigDecimal.ROUND_HALF_DOWN));
                 arguments.put("exchangeRate", oneUsdtToTrx);
                 arguments.put("trxAmount", trxValue);
-                arguments.put("FromAddress", from.replaceAll("(.{6})(.*)(.{8})", "$1\\*\\*\\*\\*$3"));
+                arguments.put("FromAddress", from.replaceAll("(.{6})(.*)(.{8})", "$1\\\\*\\\\*\\\\*\\\\*$3"));
-                arguments.put("txId", txId.replaceAll("(.{6})(.*)(.{8})", "$1\\*\\*\\*\\*\\*\\*\\*\\*$3"));
+                arguments.put("txId", txId.replaceAll("(.{6})(.*)(.{8})", "$1\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*\\\\*$3"));
                 arguments.put("txTime", DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
                 StrSubstitutor substitutor = new StrSubstitutor(arguments, "{", "}");
                 String message = substitutor.replace(sysUsdtTranferNotice);

ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml

@@ -218,8 +218,7 @@
         INNER JOIN account_address_info a ON t.account_address = a.address
         LEFT JOIN monitor_address_info m ON t.to_address = m.monitor_address
         WHERE
-        t.fcd >= #{fcd}
+         t.delegate_status = #{delegateStatus}
-        AND t.delegate_status = #{delegateStatus}
         and a.busi_type = 'trx2Energy'
         <if test="fromAddress != null  and fromAddress != ''"> and t.from_address = #{fromAddress}</if>
     </select>

ruoyi-system/src/main/resources/mapper/system/ErrorLogMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="lcd != null "> and lcd = #{lcd}</if>
             <if test="lcu != null  and lcu != ''"> and lcu = #{lcu}</if>
         </where>
+        order by fcd desc
     </select>
     
     <select id="selectErrorLogByIdErrorLog" parameterType="Long" resultMap="ErrorLogResult">