From e9cfc770c5e179292c3a606ce149c56758840deb Mon Sep 17 00:00:00 2001 From: dorion <872354125@qq.com> Date: Wed, 15 May 2024 21:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0tg=E4=BC=9A=E5=91=98=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=85=85=E5=80=BC=E4=BB=A3=E7=A0=81,=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E7=9B=91=E5=90=AC=E5=9C=B0=E5=9D=80=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E5=92=8C=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/pom.xml | 4 +- .../main/java/com/ruoyi/RuoYiApplication.java | 2 + .../src/main/resources/application.yml | 2 +- .../templates/trx2Energy/exchange/trx.html | 262 ++++++++++-------- .../templates/trx2Energy/monitor/add.html | 16 +- .../templates/trx2Energy/monitor/edit.html | 17 +- .../templates/trx2Energy/monitor/monitor.html | 15 +- .../templates/usdt2Trx/exchange/add.html | 2 +- .../templates/usdt2Trx/exchange/usdt.html | 26 +- .../templates/usdt2Trx/monitor/add.html | 12 + .../templates/usdt2Trx/monitor/edit.html | 13 + .../templates/usdt2Trx/monitor/monitor.html | 15 +- .../domain/entity/MonitorAddressInfo.java | 7 + .../core/domain/entity/TrxExchangeInfo.java | 3 + .../core/domain/entity/UsdtExchangeInfo.java | 3 +- .../system/api/impl/FragmentApiImpl.java | 3 +- .../ruoyi/system/bot/TgLongPollingBot.java | 3 +- .../handler/TgPremiumTransferHandler.java | 9 +- .../system/mapper/TrxExchangeInfoMapper.java | 2 + .../system/mapper/UsdtExchangeInfoMapper.java | 2 + .../service/impl/ErrorLogServiceImpl.java | 2 - .../impl/TrxExchangeInfoServiceImpl.java | 3 +- .../impl/UsdtExchangeInfoServiceImpl.java | 3 +- .../account/MonitorAddressInfoMapper.xml | 16 +- .../mapper/exchange/TrxExchangeInfoMapper.xml | 50 ++++ .../exchange/UsdtExchangeInfoMapper.xml | 38 +++ 26 files changed, 371 insertions(+), 159 deletions(-) diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index c724f7288..ce567a730 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -147,7 +147,7 @@ --> ${project.artifactId} - + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 04b4d5abc..7973520b8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -8,6 +8,7 @@ import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.scheduling.annotation.EnableAsync; import org.telegram.telegrambots.meta.TelegramBotsApi; import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; @@ -19,6 +20,7 @@ import org.telegram.telegrambots.updatesreceivers.DefaultBotSession; @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) @MapperScan("com.ruoyi.system.mapper") @Slf4j +@EnableAsync public class RuoYiApplication implements CommandLineRunner { @Autowired(required = false) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8389880a1..3f7281aea 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -34,7 +34,7 @@ server: # 日志配置 logging: level: - com.ruoyi: info + com.ruoyi: debug org.springframework: warn # 用户配置 diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/exchange/trx.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/exchange/trx.html index a9fe572f7..c582a9228 100644 --- a/ruoyi-admin/src/main/resources/templates/trx2Energy/exchange/trx.html +++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/exchange/trx.html @@ -1,103 +1,111 @@ - + -
-
-
-
-
-
    -
  • - - -
    • -
  • - - -
    • - +
    +
    +
    + +
    +
      +
    • + + +
      • +
    • + + +
      • + -
    • - - -
      • +
    • + + +
      • - -
    • - - -
      • - - -
    • - - -
      • + +
    • + + +
      • + + +
    • + + + - + +
      • -
    • -  搜索 -  重置 -
      • -
    -
    - -
    +
  • +  搜索 +  重置 +
    • +
+
+ +
- -
-
-
+ +
+
- - + }; + $.table.init(options); + }); + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/add.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/add.html index ab79768f9..028aaf32b 100644 --- a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/add.html +++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/add.html @@ -15,10 +15,16 @@
--> +
+ +
+ +
+
- +
@@ -33,7 +39,7 @@
- +
@@ -60,6 +66,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/edit.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/edit.html index 6d1de5936..00636fc07 100644 --- a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/edit.html +++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/edit.html @@ -8,14 +8,13 @@
- +
@@ -71,6 +70,12 @@
+
+ +
+ +
+
diff --git a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/monitor.html b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/monitor.html index b35a737a1..3c750a275 100644 --- a/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/monitor.html +++ b/ruoyi-admin/src/main/resources/templates/trx2Energy/monitor/monitor.html @@ -36,9 +36,11 @@ -
  • +
  • - + + - +
  •  搜索 @@ -93,6 +95,10 @@ title: '主键', visible: false }, + { + field: 'monitorAddressName', + title: '地址别名' + }, { field: 'monitorAddress', title: '监听地址' @@ -148,7 +154,10 @@ formatter: function(value, item, index) { return $.table.selectDictLabel(datas, item.isValid); } - }, + }, { + field: 'comment', + title: '备注' + }, { field: 'fcd', title: '创建时间', diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html index d68178aee..405917089 100644 --- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html +++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/add.html @@ -8,7 +8,7 @@
    - +
    diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html index 48e079aaf..bf9a2d2ab 100644 --- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html +++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/exchange/usdt.html @@ -23,9 +23,11 @@
    • -
  • +
  • - + + - +
  • @@ -80,15 +82,25 @@ }, { field: 'fromAddress', - title: '交易地址', + title: '付款账户', formatter:function(value, row, index) { return "" + value + ""; } }, - { - field: 'toAddress', - title: '转入地址' - }, + { + field: 'toAddress', + title: '收款账户', + visible: false + }, { + field: 'monitorAddressName', + title: '收款账户别名', + formatter: function (value, row, index) { + if (value == null) { + return value; + } + return "" + value + ""; + } + }, { field: 'usdtTxId', title: '交易订单' diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/add.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/add.html index 6654f9e1f..ff757b406 100644 --- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/add.html +++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/add.html @@ -15,6 +15,12 @@ --> +
    + +
    + +
    +
    @@ -40,6 +46,12 @@
    +
    + +
    + +
    +
    diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/edit.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/edit.html index 07d8c10e4..2b97479be 100644 --- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/edit.html +++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/edit.html @@ -16,6 +16,12 @@ --> +
    + +
    + +
    +
    @@ -51,6 +57,13 @@
    +
    + +
    + +
    +
    + diff --git a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/monitor.html b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/monitor.html index a523e3126..6f2cd8900 100644 --- a/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/monitor.html +++ b/ruoyi-admin/src/main/resources/templates/usdt2Trx/monitor/monitor.html @@ -36,9 +36,11 @@
    • -
  • +
  • - + + - +
  •  搜索 @@ -93,6 +95,10 @@ title: '主键', visible: false }, + { + field: 'monitorAddressName', + title: '地址别名' + }, { field: 'monitorAddress', title: '监听地址' @@ -121,7 +127,10 @@ formatter: function(value, item, index) { return $.table.selectDictLabel(datas, item.isValid); } - }, + },{ + field: 'comment', + title: '备注' + }, { field: 'fcd', title: '创建时间', diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java index f500decfb..dab66140f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MonitorAddressInfo.java @@ -28,6 +28,10 @@ public class MonitorAddressInfo extends BaseEntity @Excel(name = "业务类型") private String busiType; + /** 地址别名 */ + @Excel(name = "地址别名") + private String monitorAddressName; + /** 监听地址 */ @Excel(name = "监听地址") private String monitorAddress; @@ -60,6 +64,9 @@ public class MonitorAddressInfo extends BaseEntity /** 绑定时长 */ @Excel(name = "绑定时长") private String bindPeriod; + /** 备注 */ + @Excel(name = "备注") + private String comment; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java index 39dba181f..b3957d4d6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/TrxExchangeInfo.java @@ -34,6 +34,9 @@ public class TrxExchangeInfo extends BaseEntity @Sensitive(desensitizedType = DesensitizedType.WALLET_ADDRESS) private String toAddress; + @Excel(name = "监听账户别名") + private String monitorAddressName; + /** 实际出账账户 */ @Excel(name = "实际出账账户") @Sensitive(desensitizedType = DesensitizedType.WALLET_ADDRESS) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UsdtExchangeInfo.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UsdtExchangeInfo.java index 8e2ce71f6..95dcdf575 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UsdtExchangeInfo.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UsdtExchangeInfo.java @@ -32,7 +32,8 @@ public class UsdtExchangeInfo extends BaseEntity @Excel(name = "转入地址") private String toAddress; - + @Excel(name = "收款账号别名") + private String monitorAddressName; /** 出账地址 */ @Excel(name = "出账地址") private String accountAddress; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/api/impl/FragmentApiImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/api/impl/FragmentApiImpl.java index af7e26ad1..a4d30d8cf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/api/impl/FragmentApiImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/api/impl/FragmentApiImpl.java @@ -209,7 +209,8 @@ public class FragmentApiImpl implements IFragmentApi { String formBody = "{\"" + address + "\":\"" + amount + "\"}"; StringEntity requestEntity = new StringEntity(formBody, ContentType.APPLICATION_FORM_URLENCODED); httpPost.setEntity(requestEntity); - +// httpClient.getParams().setParameter(CoreConnectionPNames.CONNECTION_TIMEOUT, 50000); // 设置连接超时时间为5秒 +// httpClient.getParams().setParameter(CoreConnectionPNames.SO_TIMEOUT, 50000); // 设置读取超时时间为5秒 // 发送请求并获取响应 HttpResponse response = httpClient.execute(httpPost); if (response.getStatusLine().getStatusCode() != 200) { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/bot/TgLongPollingBot.java b/ruoyi-system/src/main/java/com/ruoyi/system/bot/TgLongPollingBot.java index f4e4f247b..34bebe21d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/bot/TgLongPollingBot.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/bot/TgLongPollingBot.java @@ -4,12 +4,11 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; import org.telegram.telegrambots.bots.TelegramLongPollingBot; import org.telegram.telegrambots.meta.api.objects.Update; import org.telegram.telegrambots.meta.exceptions.TelegramApiException; -@Component +//@Component @Slf4j public class TgLongPollingBot extends TelegramLongPollingBot { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/handler/TgPremiumTransferHandler.java b/ruoyi-system/src/main/java/com/ruoyi/system/handler/TgPremiumTransferHandler.java index 673dfb6c9..4bd6aaf28 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/handler/TgPremiumTransferHandler.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/handler/TgPremiumTransferHandler.java @@ -14,6 +14,7 @@ import com.ruoyi.system.mapper.TgPremiumOrderInfoMapper; import com.ruoyi.system.service.IErrorLogService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import java.io.IOException; @@ -34,10 +35,11 @@ public class TgPremiumTransferHandler { @Autowired private TgPremiumOrderInfoMapper tgPremiumOrderInfoMapper; + @Async public void doRechargeAndUpdate(TgPremiumOrderInfo tgPremiumOrderInfo) { doRecharge(tgPremiumOrderInfo); - tgPremiumOrderInfo.setLcu("syste"); + tgPremiumOrderInfo.setLcu("system"); tgPremiumOrderInfoMapper.updateTgPremiumOrderInfo(tgPremiumOrderInfo); } @@ -124,7 +126,10 @@ public class TgPremiumTransferHandler { } while (count < 5); } - tgPremiumOrderInfo.setTgPaymentStatus("E"); + if (count >= 5) { + tgPremiumOrderInfo.setTgPaymentStatus("E"); + } + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java index d7184676b..ccb043094 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TrxExchangeInfoMapper.java @@ -66,4 +66,6 @@ public interface TrxExchangeInfoMapper List selectTrxExchangeMonitorAccountInfo(TrxExchangeInfo trxExchangeInfo); List selectTransactionLogVO(); + + List selectTrxExchangeInfoAndMonitorNameList(TrxExchangeInfo trxExchangeInfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtExchangeInfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtExchangeInfoMapper.java index 383178abf..5af7fc299 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtExchangeInfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UsdtExchangeInfoMapper.java @@ -60,4 +60,6 @@ public interface UsdtExchangeInfoMapper * @return 结果 */ public int deleteUsdtExchangeInfoByIdUsdtExchangeInfos(String[] idUsdtExchangeInfos); + + List selectUsdtExchangeInfoAndMonitorNameList(UsdtExchangeInfo usdtExchangeInfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java index c6265e5e7..b6745455e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ErrorLogServiceImpl.java @@ -14,7 +14,6 @@ import com.ruoyi.system.service.ISysConfigService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.text.StrSubstitutor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.telegram.telegrambots.meta.api.methods.ParseMode; import org.telegram.telegrambots.meta.api.methods.send.SendMessage; @@ -75,7 +74,6 @@ public class ErrorLogServiceImpl implements IErrorLogService { * @return 结果 */ @Override - @Async public int insertErrorLog(ErrorLog errorLog){ String sysErrorLogTemplate = configService.selectConfigByKey("sys.error.log.template"); String sysErrorLogChatId = configService.selectConfigByKey("sys.error.log.chatid"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java index 333678801..74c8a5939 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TrxExchangeInfoServiceImpl.java @@ -68,7 +68,8 @@ public class TrxExchangeInfoServiceImpl implements ITrxExchangeInfoService { */ @Override public List selectTrxExchangeInfoList(TrxExchangeInfo trxExchangeInfo) { - return trxExchangeInfoMapper.selectTrxExchangeInfoList(trxExchangeInfo); +// return trxExchangeInfoMapper.selectTrxExchangeInfoList(trxExchangeInfo); + return trxExchangeInfoMapper.selectTrxExchangeInfoAndMonitorNameList(trxExchangeInfo); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java index 0f157687e..f42a800cb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UsdtExchangeInfoServiceImpl.java @@ -58,7 +58,8 @@ public class UsdtExchangeInfoServiceImpl implements IUsdtExchangeInfoService { */ @Override public List selectUsdtExchangeInfoList(UsdtExchangeInfo usdtExchangeInfo) { - return usdtExchangeInfoMapper.selectUsdtExchangeInfoList(usdtExchangeInfo); +// return usdtExchangeInfoMapper.selectUsdtExchangeInfoList(usdtExchangeInfo); + return usdtExchangeInfoMapper.selectUsdtExchangeInfoAndMonitorNameList(usdtExchangeInfo); } /** diff --git a/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml index aa3955903..5021f5f62 100644 --- a/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/account/MonitorAddressInfoMapper.xml @@ -4,9 +4,11 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + @@ -15,6 +17,7 @@ + @@ -22,13 +25,14 @@ - select id_monitor_address, busi_type, monitor_address, account_address, trx_price, usdt_price, monitor_type, api_key, bind_period, is_valid, fcd, fcu, lcd, lcu from monitor_address_info + select id_monitor_address, busi_type, monitor_address_name, monitor_address, account_address, trx_price, usdt_price, monitor_type, api_key, bind_period, is_valid, comment, fcd, fcu, lcd, lcu from monitor_address_info select m.monitor_address, m.account_address, diff --git a/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml index ee1261fc5..ea50efc12 100644 --- a/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/exchange/TrxExchangeInfoMapper.xml @@ -47,6 +47,7 @@ and delegate_status = #{delegateStatus} and un_delegate_tx_id = #{unDelegateTxId} and fcd >= #{fcd} + and fcd between #{params.beginFcd} and #{params.endFcd} and fcu = #{fcu} and lcd <= #{lcd} and lcu = #{lcu} @@ -187,4 +188,53 @@ + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/exchange/UsdtExchangeInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/exchange/UsdtExchangeInfoMapper.xml index 40c69beab..661159988 100644 --- a/ruoyi-system/src/main/resources/mapper/exchange/UsdtExchangeInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/exchange/UsdtExchangeInfoMapper.xml @@ -114,4 +114,42 @@ + + + \ No newline at end of file