Merge remote-tracking branch 'origin/wzj-main' into wzj-main

- 调整日志配置，细化MyBatis和Redisson相关包的日志级别控制
- 在WithdrawRefundTask中引入TenantHelper以忽略租户上下文- 修改过期提现查询逻辑，使用租户忽略方式获取数据
- 移除不再使用的RedPacketService依赖
- 统一HikariPool和MyBatis日志级别配置格式

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@
+    org.redisson: @logging.level@
-    com.zaxxer.hikari.pool.HikariPool: @logging.level@
+    com.zaxxer.hikari.pool: @logging.level@
     com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor: @logging.level@
   config: classpath:logback-plus.xml
 

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<Withdraw> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Withdraw::getStatus, WithdrawStatus.PENDING.getCode());
             queryWrapper.le(Withdraw::getCreateTime, LocalDateTime.now().minusDays(1));
-            List<Withdraw> expiredWithdraws = withdrawService.list(queryWrapper);
+            List<Withdraw> expiredWithdraws = TenantHelper.ignore(() -> withdrawService.list(queryWrapper));
-
             for (Withdraw withdraw : expiredWithdraws) {
                 //检查是否领取，如果没有领取则退回
                 TransferDetailEntityNew response = null;