From d21c33fcd02e217ffda11fc46c082401586af8d6 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 24 Apr 2026 16:26:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E7=9A=84=E7=9B=B8=E5=85=B3=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/EmailClient.php    | 26 +++++++++++
 application/api/job/PromotionPrepareEmail.php | 43 +++++++++++--------
 application/common/PromotionService.php       |  4 +-
 3 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/application/api/controller/EmailClient.php b/application/api/controller/EmailClient.php
index 2e4bbcc..a7a2a7d 100644
--- a/application/api/controller/EmailClient.php
+++ b/application/api/controller/EmailClient.php
@@ -1728,6 +1728,32 @@ class EmailClient extends Base
         return jsonSuccess($result);
     }
 
+    public function mytestg(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "id"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $service = new PromotionService();
+        $service->enqueuePrepareEmail($data['id']);
+        $service->log("dsadsadsad");
+    }
+
+
+    public function mytestqq(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "id"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $service = new PromotionService();
+        $service->prepareSingleEmail($data['id']);
+    }
+
     /**
      * 定时任务：为指定日期的任务预生成邮件（默认明天）
      * 建议每天 22:00 执行：curl .../EmailClient/prepareTasksForDate 或 prepareTasksForDate?date=2026-03-12
diff --git a/application/api/job/PromotionPrepareEmail.php b/application/api/job/PromotionPrepareEmail.php
index 793e8c3..5de5d91 100644
--- a/application/api/job/PromotionPrepareEmail.php
+++ b/application/api/job/PromotionPrepareEmail.php
@@ -25,28 +25,33 @@ class PromotionPrepareEmail
         $logId   = intval(isset($data['log_id']) ? $data['log_id'] : 0);
         $service = new PromotionService();
 
+        $service->log('[PromotionPrepareEmail] m11ylog=' . $logId);
+
+
         if (!$logId) {
             $job->delete();
             return;
         }
-
-        try {
-            $result = $service->prepareSingleEmail($logId);
-            $service->log('[PromotionPrepareEmail] log=' . $logId
-                . ' code=' . $result['code']
-                . ' llm_status=' . $result['llm_status']
-                . ' msg=' . $result['msg']);
-            $job->delete();
-        } catch (\Exception $e) {
-            $service->log('[PromotionPrepareEmail] log=' . $logId
-                . ' attempts=' . $job->attempts()
-                . ' exception=' . $e->getMessage());
-
-            if ($job->attempts() >= 3) {
-                $job->delete();
-            } else {
-                $job->release(30);
-            }
-        }
+        $result = $service->prepareSingleEmail($logId);
+        $service->log('[PromotionPrepareEm111ail] m11ylog=' . $logId);
+//
+//        try {
+//            $result = $service->prepareSingleEmail($logId);
+//            $service->log('[PromotionPrepareEmail] log=' . $logId
+//                . ' code=' . $result['code']
+//                . ' llm_status=' . $result['llm_status']
+//                . ' msg=' . $result['msg']);
+//            $job->delete();
+//        } catch (\Exception $e) {
+//            $service->log('[PromotionPrepareEmail] log=' . $logId
+//                . ' attempts=' . $job->attempts()
+//                . ' exception=' . $e->getMessage());
+//
+//            if ($job->attempts() >= 3) {
+//                $job->delete();
+//            } else {
+//                $job->release(30);
+//            }
+//        }
     }
 }
diff --git a/application/common/PromotionService.php b/application/common/PromotionService.php
index 54a6ab0..9628ef7 100644
--- a/application/common/PromotionService.php
+++ b/application/common/PromotionService.php
@@ -603,9 +603,9 @@ class PromotionService
         $data     = ['log_id' => intval($logId)];
 
         if ($delay > 0) {
-            Queue::later($delay, $jobClass, $data, 'promotionPrepareEmail');
+            Queue::later($delay, $jobClass, $data, 'promotionmmm');
         } else {
-            Queue::push($jobClass, $data, 'promotionPrepareEmail');
+            Queue::push($jobClass, $data, 'promotionmmm');
         }
     }