diff --git a/application/api/controller/EmailClient.php b/application/api/controller/EmailClient.php index a7a2a7d..e6a536c 100644 --- a/application/api/controller/EmailClient.php +++ b/application/api/controller/EmailClient.php @@ -1737,8 +1737,7 @@ class EmailClient extends Base return jsonError($rule->getError()); } $service = new PromotionService(); - $service->enqueuePrepareEmail($data['id']); - $service->log("dsadsadsad"); + $service->dispatchPrepareEmails($data['id']); } diff --git a/application/api/job/PromotionPrepareTask.php b/application/api/job/PromotionPrepareTask.php index a0cf2dd..3e9cfd1 100644 --- a/application/api/job/PromotionPrepareTask.php +++ b/application/api/job/PromotionPrepareTask.php @@ -21,21 +21,21 @@ class PromotionPrepareTask { $taskId = intval(isset($data['task_id']) ? $data['task_id'] : 0); $service = new PromotionService(); + $result = $service->dispatchPrepareEmails($taskId); +// if (!$taskId) { +// $job->delete(); +// return; +// } - if (!$taskId) { - $job->delete(); - return; - } - - try { - $result = $service->dispatchPrepareEmails($taskId); - $service->log('[PromotionPrepareTask] task=' . $taskId - . ' dispatched=' . $result['dispatched'] - . ' already_done=' . ($result['already_done'] ? 1 : 0) - . (empty($result['error']) ? '' : ' error=' . $result['error'])); - } catch (\Exception $e) { - $service->log('[PromotionPrepareTask] task=' . $taskId . ' exception=' . $e->getMessage()); - } +// try { +// $result = $service->dispatchPrepareEmails($taskId); +// $service->log('[PromotionPrepareTask] task=' . $taskId +// . ' dispatched=' . $result['dispatched'] +// . ' already_done=' . ($result['already_done'] ? 1 : 0) +// . (empty($result['error']) ? '' : ' error=' . $result['error'])); +// } catch (\Exception $e) { +// $service->log('[PromotionPrepareTask] task=' . $taskId . ' exception=' . $e->getMessage()); +// } $job->delete(); } diff --git a/application/common/PromotionService.php b/application/common/PromotionService.php index 666a332..016e3cf 100644 --- a/application/common/PromotionService.php +++ b/application/common/PromotionService.php @@ -585,9 +585,9 @@ class PromotionService $data = ['task_id' => intval($taskId)]; if ($delay > 0) { - Queue::later($delay, $jobClass, $data, 'promotionPrepareTask'); + Queue::later($delay, $jobClass, $data, 'PromotionPrepareTask'); } else { - Queue::push($jobClass, $data, 'promotionPrepareTask'); + Queue::push($jobClass, $data, 'PromotionPrepareTask'); } }