From 0be20584cf47dfc3901f787415c1eed86d63fdb4 Mon Sep 17 00:00:00 2001 From: huk Date: Fri, 10 Oct 2025 13:01:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(transaction):=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E9=80=80=E6=AC=BE=E4=BB=BB=E5=8A=A1=E7=9A=84=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E5=BF=BD=E7=95=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整日志配置,细化MyBatis和Redisson相关包的日志级别控制 - 在WithdrawRefundTask中引入TenantHelper以忽略租户上下文- 修改过期提现查询逻辑,使用租户忽略方式获取数据 - 移除不再使用的RedPacketService依赖 - 统一HikariPool和MyBatis日志级别配置格式 --- ruoyi-admin/src/main/resources/application.yml | 7 ++++--- .../wzj/soopin/transaction/task/WithdrawRefundTask.java | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index beb32267e..a10e69961 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -43,10 +43,11 @@ logging: org.dromara: @logging.level@ com.wzj.soopin: @logging.level@ org.springframework: @logging.level@ - org.mybatis.spring.mapper: @logging.level@ + org.mybatis.spring: @logging.level@ + com.baomidou: @logging.level@ org.apache.fury: @logging.level@ - org.redisson.command.RedisExecutor: @logging.level@ - com.zaxxer.hikari.pool.HikariPool: @logging.level@ + org.redisson: @logging.level@ + com.zaxxer.hikari.pool: @logging.level@ com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor: @logging.level@ config: classpath:logback-plus.xml diff --git a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/task/WithdrawRefundTask.java b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/task/WithdrawRefundTask.java index f6f07f426..ad6a6836b 100644 --- a/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/task/WithdrawRefundTask.java +++ b/ruoyi-modules/ruoyi-transaction/src/main/java/com/wzj/soopin/transaction/task/WithdrawRefundTask.java @@ -5,10 +5,10 @@ import com.wzj.soopin.transaction.domain.entity.TransferDetailEntityNew; import com.wzj.soopin.transaction.domain.po.Withdraw; import com.wzj.soopin.transaction.enums.WithdrawStatus; import com.wzj.soopin.transaction.service.IWithdrawService; -import com.wzj.soopin.transaction.service.RedPacketService; import com.wzj.soopin.transaction.service.impl.WxPayService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.dromara.common.tenant.helper.TenantHelper; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -35,8 +35,7 @@ public class WithdrawRefundTask { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Withdraw::getStatus, WithdrawStatus.PENDING.getCode()); queryWrapper.le(Withdraw::getCreateTime, LocalDateTime.now().minusDays(1)); - List expiredWithdraws = withdrawService.list(queryWrapper); - + List expiredWithdraws = TenantHelper.ignore(() -> withdrawService.list(queryWrapper)); for (Withdraw withdraw : expiredWithdraws) { //检查是否领取,如果没有领取则退回 TransferDetailEntityNew response = null;