Merge remote-tracking branch 'origin/master'

YunaiV · Nov 2, 2024 · 246c095 · 246c095
2 parents 11fd5c3 + 243ad66
commit 246c095
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 5 deletions.
diff --git a/...dao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java b/...dao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/notify/PayNotifyJob.java
@@ -1,5 +1,6 @@
 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;
@@ -23,9 +24,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/...module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java b/...module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderExpireJob.java
@@ -1,5 +1,6 @@
 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;
@@ -24,9 +25,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/...o-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java b/...o-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/order/PayOrderSyncJob.java
@@ -1,5 +1,6 @@
 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;
@@ -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/...module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java b/...module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/refund/PayRefundSyncJob.java
@@ -1,5 +1,6 @@
 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;
@@ -24,9 +25,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/...le-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/job/transfer/PayTransferSyncJob.java b/...le-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;
@@ -24,8 +25,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);
     }
 }