|
@@ -34,13 +34,18 @@ class NewUserPushMsgDelay implements ShouldQueue
|
|
private function findUserTasks(): Collection
|
|
private function findUserTasks(): Collection
|
|
{
|
|
{
|
|
$user = User::find($this->uid);
|
|
$user = User::find($this->uid);
|
|
- $send_order_id = $user->send_order_id;
|
|
|
|
- $send_order = QappSendOrder::where('send_order_id', $send_order_id)->first();
|
|
|
|
- $account = $send_order->account;
|
|
|
|
- return QappNewUserPushTask::where('qapp_account', $account)
|
|
|
|
- ->where('is_enabled', 1)
|
|
|
|
- ->where('is_deleted', 0)
|
|
|
|
- ->get();
|
|
|
|
|
|
+ if ($user) {
|
|
|
|
+ $send_order_id = $user->send_order_id;
|
|
|
|
+ $send_order = QappSendOrder::where('send_order_id', $send_order_id)->first();
|
|
|
|
+ if ($send_order) {
|
|
|
|
+ $account = $send_order->account;
|
|
|
|
+ return QappNewUserPushTask::where('qapp_account', $account)
|
|
|
|
+ ->where('is_enabled', 1)
|
|
|
|
+ ->where('is_deleted', 0)
|
|
|
|
+ ->get();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return [];
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -53,7 +58,6 @@ class NewUserPushMsgDelay implements ShouldQueue
|
|
$tasks = $this->findUserTasks();
|
|
$tasks = $this->findUserTasks();
|
|
foreach ($tasks as $task) {
|
|
foreach ($tasks as $task) {
|
|
$job = new NewUserPushMsg($this->uid, $task);
|
|
$job = new NewUserPushMsg($this->uid, $task);
|
|
- $job->handle();
|
|
|
|
dispatch($job)->onConnection('rabbitmq')->onQueue('new_user_push_msg')->delay($task->time_delay);
|
|
dispatch($job)->onConnection('rabbitmq')->onQueue('new_user_push_msg')->delay($task->time_delay);
|
|
}
|
|
}
|
|
}
|
|
}
|