From 5208f2878ee576fcb6378828ac7c89132c465b96 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 27 Oct 2024 15:57:05 +0800 Subject: [PATCH] =?UTF-8?q?146=20=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E3=80=91PAY=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=80=BC=E5=AF=BC=E8=87=B4=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iocoder/yudao/module/pay/job/notify/PayNotifyJob.java | 7 ++++--- .../yudao/module/pay/job/order/PayOrderExpireJob.java | 7 ++++--- .../yudao/module/pay/job/order/PayOrderSyncJob.java | 6 ++++-- .../yudao/module/pay/job/refund/PayRefundSyncJob.java | 7 ++++--- .../yudao/module/pay/job/transfer/PayTransferSyncJob.java | 4 +++- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java index b8d857b2a..f929ebb9a 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java @@ -1,13 +1,13 @@ 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.module.pay.service.notify.PayNotifyService; import com.xxl.job.core.handler.annotation.XxlJob; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; - /** * 支付通知 Job * 通过不断扫描待通知的 PayNotifyTaskDO 记录，回调业务线的回调接口 @@ -23,9 +23,10 @@ public class PayNotifyJob { @XxlJob("payNotifyJob") @TenantJob // 多租户 - public void execute() throws Exception { + public String execute() throws Exception { int notifyCount = payNotifyService.executeNotify(); log.info("[execute][执行支付通知 ({}) 个]", notifyCount); + return StrUtil.format("执行支付通知 ({}) 个",notifyCount); } } diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java index e341b7b72..e7b1c1bdf 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java @@ -1,13 +1,13 @@ 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.module.pay.service.order.PayOrderService; import com.xxl.job.core.handler.annotation.XxlJob; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; - /** * 支付订单的过期 Job * @@ -24,9 +24,10 @@ public class PayOrderExpireJob { @XxlJob("payOrderExpireJob") @TenantJob // 多租户 - public void execute(String param) { + public String execute(String param) { int count = orderService.expireOrder(); log.info("[execute][支付过期 ({}) 个]", count); + return StrUtil.format("支付过期 ({}) 个",count); } } diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java index bd247d082..28b6e8faf 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java @@ -1,12 +1,13 @@ 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.module.pay.service.order.PayOrderService; import com.xxl.job.core.handler.annotation.XxlJob; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; import java.time.Duration; import java.time.LocalDateTime; @@ -35,10 +36,11 @@ public class PayOrderSyncJob { @XxlJob("payOrderSyncJob") @TenantJob // 多租户 - public void execute() { + public String execute() { LocalDateTime minCreateTime = LocalDateTime.now().minus(CREATE_TIME_DURATION_BEFORE); int count = orderService.syncOrder(minCreateTime); log.info("[execute][同步支付订单 ({}) 个]", count); + return StrUtil.format("同步支付订单 ({}) 个",count); } } diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java index 36a27b820..5ecc5cb22 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java @@ -1,13 +1,13 @@ 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.module.pay.service.refund.PayRefundService; import com.xxl.job.core.handler.annotation.XxlJob; +import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import jakarta.annotation.Resource; - /** * 退款订单的同步 Job * @@ -24,9 +24,10 @@ public class PayRefundSyncJob { @XxlJob("payRefundSyncJob") @TenantJob // 多租户 - public void execute() { + public String execute() { int count = refundService.syncRefund(); log.info("[execute][同步退款订单 ({}) 个]", count); + return StrUtil.format("同步退款订单 ({}) 个",count); } } diff --git a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/transfer/PayTransferSyncJob.java b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/transfer/PayTransferSyncJob.java index 23ff13699..263981e93 100644 --- a/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/transfer/PayTransferSyncJob.java +++ b/yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/transfer/PayTransferSyncJob.java @@ -1,5 +1,6 @@ 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.module.pay.service.transfer.PayTransferService; import com.xxl.job.core.handler.annotation.XxlJob; @@ -23,8 +24,9 @@ public class PayTransferSyncJob { @XxlJob("payTransferSyncJob") @TenantJob // 多租户 - public void execute(String param) { + public String execute(String param) { int count = transferService.syncTransfer(); log.info("[execute][同步转账订单 ({}) 个]", count); + return StrUtil.format("同步转账订单 ({}) 个",count); } }