修改自动推广的相关任务

application/common/PromotionService.php

@@ -319,19 +319,27 @@ class PromotionService
             $this->log("dispatchPrepareEmails task_id={$taskId} no_logs -> state=5");
             return ['dispatched' => 0, 'already_done' => true, 'error' => null];
         }
-
-//        return $logIds;
-
-
         foreach ($logIds as $logId) {
-            echo $logId."----";
             $this->enqueuePrepareEmail(intval($logId));
         }
-
         $this->log("dispatchPrepareEmails task_id={$taskId} dispatched=" . count($logIds));
         return ['dispatched' => count($logIds), 'already_done' => false, 'error' => null];
     }
 
+    public function prepareSingleEmailTest($logId){
+        $log = Db::name('promotion_email_log')->where('log_id', $logId)->find();
+//        $task = Db::name('promotion_task')->where('task_id', $log['task_id'])->find();
+//        if (!$task) {
+//            Db::name('promotion_email_log')->where('log_id', $logId)->update([
+//                'state'     => 2,
+//                'error_msg' => 'Task not found',
+//                'send_time' => time(),
+//            ]);
+//            return ['code' => 1, 'msg' => 'task_not_found', 'llm_status' => 0];
+//        }
+        return jsonSuccess($log);
+    }
+
     /**
      * 对单封邮件执行准备：拉取 expert / journal，调 LLM 生成描述，渲染模板，写回 log。
      *
@@ -768,16 +776,14 @@ class PromotionService
      * 队列名：promotion_email
      * 启动 worker：php think queue:listen --queue promotion_email
      */
-    public function enqueuePrepareEmail($logId, $delay = 0)
+    public function enqueuePrepareEmail($logId)
     {
         $jobClass = 'app\api\job\PromotionPrepareEmail@fire';
         $data     = ['log_id' => intval($logId)];
 
-        if ($delay > 0) {
-            Queue::later($delay, $jobClass, $data, 'PromotionPrepareEmail');
-        } else {
-            Queue::push($jobClass, $data, 'PromotionPrepareEmail');
-        }
+
+        $res =Queue::push($jobClass, $data, 'PromotionPrepareEmail');
+
     }
 
     /**