From aa1ea41c5d76395b7965a792744dddf1f8ca6eb1 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 2 Dec 2024 08:46:40 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Tasks/EmailNoticeTask.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/Tasks/EmailNoticeTask.php b/app/Tasks/EmailNoticeTask.php
index 1a8f91156..288d3b4fb 100644
--- a/app/Tasks/EmailNoticeTask.php
+++ b/app/Tasks/EmailNoticeTask.php
@@ -106,9 +106,9 @@ class EmailNoticeTask extends AbstractTask
             ->groupBy('web_socket_dialog_msg_reads.userid');
 
         // 分批处理用户的未读消息
-        $query->chunk(self::CHUNK_SIZE, function($users) use ($dialogType, $startTime, $endTime) {
+        $query->chunk(self::CHUNK_SIZE, function($users) use ($dialogType) {
             foreach ($users as $userData) {
-                $this->sendUserEmail($userData->userid, $dialogType, $startTime, $endTime);
+                $this->sendUserEmail($userData->userid, $dialogType);
             }
         });
 
@@ -121,7 +121,7 @@ class EmailNoticeTask extends AbstractTask
     /**
      * 发送用户的未读消息邮件
      */
-    private function sendUserEmail(int $userId, string $dialogType, Carbon $startTime, Carbon $endTime): void
+    private function sendUserEmail(int $userId, string $dialogType): void
     {
         // 验证用户
         $user = User::whereDisableAt(null)->find($userId);
@@ -130,7 +130,7 @@ class EmailNoticeTask extends AbstractTask
         }
 
         // 获取未读消息
-        $messages = $this->getUnreadMessages($userId, $dialogType, $startTime, $endTime);
+        $messages = $this->getUnreadMessages($userId, $dialogType);
         if ($messages->isEmpty()) {
             return;
         }
@@ -156,7 +156,7 @@ class EmailNoticeTask extends AbstractTask
     /**
      * 获取用户的未读消息
      */
-    private function getUnreadMessages($userId, $dialogType, Carbon $startTime, Carbon $endTime)
+    private function getUnreadMessages($userId, $dialogType)
     {
         return WebSocketDialogMsg::select([
             'web_socket_dialog_msgs.*',
@@ -171,7 +171,6 @@ class EmailNoticeTask extends AbstractTask
                 'web_socket_dialog_msgs.dialog_type' => $dialogType
             ])
             ->whereNull('r.read_at')
-            ->whereBetween('web_socket_dialog_msgs.created_at', [$startTime, $endTime])
             ->whereIn('web_socket_dialog_msgs.type', self::ALLOWED_MSG_TYPES)
             ->orderBy('web_socket_dialog_msgs.created_at')
             ->limit(self::CHUNK_SIZE)