146 【功能修复】PAY:修复定时任务没有返回值导致的异常

pull/147/MERGE
YunaiV 2024-10-27 15:57:05 +08:00
parent 3352eab759
commit 5208f2878e
5 changed files with 19 additions and 12 deletions

View File

@ -1,13 +1,13 @@
package cn.iocoder.yudao.module.pay.job.notify; package cn.iocoder.yudao.module.pay.job.notify;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService; import cn.iocoder.yudao.module.pay.service.notify.PayNotifyService;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
/** /**
* Job * Job
* PayNotifyTaskDO 线 * PayNotifyTaskDO 线
@ -23,9 +23,10 @@ public class PayNotifyJob {
@XxlJob("payNotifyJob") @XxlJob("payNotifyJob")
@TenantJob // 多租户 @TenantJob // 多租户
public void execute() throws Exception { public String execute() throws Exception {
int notifyCount = payNotifyService.executeNotify(); int notifyCount = payNotifyService.executeNotify();
log.info("[execute][执行支付通知 ({}) 个]", notifyCount); log.info("[execute][执行支付通知 ({}) 个]", notifyCount);
return StrUtil.format("执行支付通知 ({}) 个",notifyCount);
} }
} }

View File

@ -1,13 +1,13 @@
package cn.iocoder.yudao.module.pay.job.order; package cn.iocoder.yudao.module.pay.job.order;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.pay.service.order.PayOrderService; import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
/** /**
* Job * Job
* *
@ -24,9 +24,10 @@ public class PayOrderExpireJob {
@XxlJob("payOrderExpireJob") @XxlJob("payOrderExpireJob")
@TenantJob // 多租户 @TenantJob // 多租户
public void execute(String param) { public String execute(String param) {
int count = orderService.expireOrder(); int count = orderService.expireOrder();
log.info("[execute][支付过期 ({}) 个]", count); log.info("[execute][支付过期 ({}) 个]", count);
return StrUtil.format("支付过期 ({}) 个",count);
} }
} }

View File

@ -1,12 +1,13 @@
package cn.iocoder.yudao.module.pay.job.order; package cn.iocoder.yudao.module.pay.job.order;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.pay.service.order.PayOrderService; import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
import java.time.Duration; import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -35,10 +36,11 @@ public class PayOrderSyncJob {
@XxlJob("payOrderSyncJob") @XxlJob("payOrderSyncJob")
@TenantJob // 多租户 @TenantJob // 多租户
public void execute() { public String execute() {
LocalDateTime minCreateTime = LocalDateTime.now().minus(CREATE_TIME_DURATION_BEFORE); LocalDateTime minCreateTime = LocalDateTime.now().minus(CREATE_TIME_DURATION_BEFORE);
int count = orderService.syncOrder(minCreateTime); int count = orderService.syncOrder(minCreateTime);
log.info("[execute][同步支付订单 ({}) 个]", count); log.info("[execute][同步支付订单 ({}) 个]", count);
return StrUtil.format("同步支付订单 ({}) 个",count);
} }
} }

View File

@ -1,13 +1,13 @@
package cn.iocoder.yudao.module.pay.job.refund; package cn.iocoder.yudao.module.pay.job.refund;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.pay.service.refund.PayRefundService; import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import jakarta.annotation.Resource;
/** /**
* 退 Job * 退 Job
* *
@ -24,9 +24,10 @@ public class PayRefundSyncJob {
@XxlJob("payRefundSyncJob") @XxlJob("payRefundSyncJob")
@TenantJob // 多租户 @TenantJob // 多租户
public void execute() { public String execute() {
int count = refundService.syncRefund(); int count = refundService.syncRefund();
log.info("[execute][同步退款订单 ({}) 个]", count); log.info("[execute][同步退款订单 ({}) 个]", count);
return StrUtil.format("同步退款订单 ({}) 个",count);
} }
} }

View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.pay.job.transfer; package cn.iocoder.yudao.module.pay.job.transfer;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.tenant.core.job.TenantJob; import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
import cn.iocoder.yudao.module.pay.service.transfer.PayTransferService; import cn.iocoder.yudao.module.pay.service.transfer.PayTransferService;
import com.xxl.job.core.handler.annotation.XxlJob; import com.xxl.job.core.handler.annotation.XxlJob;
@ -23,8 +24,9 @@ public class PayTransferSyncJob {
@XxlJob("payTransferSyncJob") @XxlJob("payTransferSyncJob")
@TenantJob // 多租户 @TenantJob // 多租户
public void execute(String param) { public String execute(String param) {
int count = transferService.syncTransfer(); int count = transferService.syncTransfer();
log.info("[execute][同步转账订单 ({}) 个]", count); log.info("[execute][同步转账订单 ({}) 个]", count);
return StrUtil.format("同步转账订单 ({}) 个",count);
} }
} }