diff --git a/application/api/controller/EmailClient.php b/application/api/controller/EmailClient.php index e6a536c..ca39e8e 100644 --- a/application/api/controller/EmailClient.php +++ b/application/api/controller/EmailClient.php @@ -2183,7 +2183,7 @@ class EmailClient extends Base ->where('f.state', 0) ->where('f.expert_type', 5) ->where('j.state', 0) - ->where('j.start_promotion', 1) + ->where('f.start_promotion', 1) ->field('f.*, j.title as journal_title, j.default_template_id, j.default_style_id') ->select(); diff --git a/application/common/PromotionService.php b/application/common/PromotionService.php index 016e3cf..49b22bf 100644 --- a/application/common/PromotionService.php +++ b/application/common/PromotionService.php @@ -562,7 +562,8 @@ class PromotionService $taskIds = []; foreach ($tasks as $task) { - $this->enqueuePrepareTask($task['task_id']); + $this->dispatchPrepareEmails($task['task_id']); +// $this->enqueuePrepareTask($task['task_id']); $taskIds[] = $task['task_id']; }