修改自动推广的相关任务

application/api/job/PromotionSend.php

@@ -4,32 +4,51 @@ namespace app\api\job;
 
 use think\queue\Job;
 use app\common\PromotionService;
+use app\common\QueueJob;
 
+/**
+ * 队列任务：发送 task 下"已 prepare"的邮件，按 min/max_interval 控制节奏。
+ *
+ * processNextEmail 内部会自动把下一封邮件 later() 入队（链式延迟），
+ * 因此本 job 处理完一封即可 delete，无需在这里再 dispatch 下一封。
+ *
+ * 队列名：PromotionSend
+ */
 class PromotionSend
 {
+    private $oQueueJob;
+
+    public function __construct()
+    {
+        $this->oQueueJob = new QueueJob();
+    }
+
     public function fire(Job $job, $data)
     {
-        $taskId  = intval(isset($data['task_id']) ? $data['task_id'] : 0);
-        $service = new PromotionService();
+        $this->oQueueJob->init($job);
 
-        if (!$taskId) {
-//            $service->log('[PromotionSend] missing task_id, job deleted');
+        $taskId = isset($data['task_id']) ? intval($data['task_id']) : 0;
+        if ($taskId <= 0) {
+            $this->oQueueJob->log("PromotionSend 无效的 task_id，删除任务");
             $job->delete();
             return;
         }
 
-//        try {
-            $result = $service->processNextEmail($taskId);
-//            $service->log('[PromotionSend] task=' . $taskId . ' result=' . json_encode($result));
+        try {
+            $service = new PromotionService();
+            $result  = $service->processNextEmail($taskId);
 
-//            if (!empty($result['done'])) {
-//                $reason = isset($result['reason']) ? $result['reason'] : '';
-//                $service->log('[PromotionSend] task=' . $taskId . ' finished, reason=' . $reason);
-//            }
-//        } catch (\Exception $e) {
-//            $service->log('[PromotionSend] task=' . $taskId . ' exception=' . $e->getMessage());
-//        }
+            $done   = !empty($result['done']) ? 1 : 0;
+            $reason = isset($result['reason']) ? $result['reason'] : '';
+            $this->oQueueJob->log("PromotionSend 完成 | task_id={$taskId} done={$done} reason={$reason}");
 
-        $job->delete();
+            $job->delete();
+        } catch (\Exception $e) {
+            $this->oQueueJob->handleException($e, $job, "task_id={$taskId}");
+        } catch (\Throwable $e) {
+            $this->oQueueJob->handleException($e, $job, "task_id={$taskId}");
+        } finally {
+            $this->oQueueJob->finnal();
+        }
     }
 }