zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改自动推广的相关任务

Browse Source
This commit is contained in:
wangjinlei
2026-04-24 17:55:58 +08:00
parent e50decedcd
commit a955316ec3
3 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/controller/EmailClient.php
View File

@@ -1737,8 +1737,7 @@ class EmailClient extends Base
return jsonError($rule->getError()); return jsonError($rule->getError());
} }
$service = new PromotionService(); $service = new PromotionService();
$service->enqueuePrepareEmail($data['id']); $service->dispatchPrepareEmails($data['id']);
$service->log("dsadsadsad");
} }

28
application/api/job/PromotionPrepareTask.php
View File

@@ -21,21 +21,21 @@ class PromotionPrepareTask
{ {
$taskId = intval(isset($data['task_id']) ? $data['task_id'] : 0); $taskId = intval(isset($data['task_id']) ? $data['task_id'] : 0);
$service = new PromotionService(); $service = new PromotionService();
$result = $service->dispatchPrepareEmails($taskId);
// if (!$taskId) {
// $job->delete();
// return;
// }
if (!$taskId) { // try {
$job->delete(); // $result = $service->dispatchPrepareEmails($taskId);
return; // $service->log('[PromotionPrepareTask] task=' . $taskId
} // . ' dispatched=' . $result['dispatched']
// . ' already_done=' . ($result['already_done'] ? 1 : 0)
try { // . (empty($result['error']) ? '' : ' error=' . $result['error']));
$result = $service->dispatchPrepareEmails($taskId); // } catch (\Exception $e) {
$service->log('[PromotionPrepareTask] task=' . $taskId // $service->log('[PromotionPrepareTask] task=' . $taskId . ' exception=' . $e->getMessage());
. ' 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(); $job->delete();
} }

4
application/common/PromotionService.php
View File

@@ -585,9 +585,9 @@ class PromotionService
$data = ['task_id' => intval($taskId)]; $data = ['task_id' => intval($taskId)];
if ($delay > 0) { if ($delay > 0) {
Queue::later($delay, $jobClass, $data, 'promotionPrepareTask'); Queue::later($delay, $jobClass, $data, 'PromotionPrepareTask');
} else { } else {
Queue::push($jobClass, $data, 'promotionPrepareTask'); Queue::push($jobClass, $data, 'PromotionPrepareTask');
} }
} }