From 5bb8d2bb5ab9ce9b9a261b92665e63ce90c09568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Tue, 24 Aug 2021 21:38:42 +0800
Subject: [PATCH] Fixed Ticket using wrong URL

---
 app/Http/Controllers/Admin/ReportController.php | 4 ++--
 app/Http/Controllers/Admin/TicketController.php | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php
index c0fa2929..c1410de6 100644
--- a/app/Http/Controllers/Admin/ReportController.php
+++ b/app/Http/Controllers/Admin/ReportController.php
@@ -10,13 +10,13 @@ class ReportController extends Controller
     public function accounting()
     {
         $orders = Order::where('status', '>=', 2)->whereHas('goods')->latest()->get(['created_at', 'amount']);
-        $ordersByDay = $orders->where('created_at', '>=', date('Y-m-01', strtotime('-1 months')))->groupBy(function ($item) {
+        $ordersByDay = $orders->groupBy(function ($item) {
             return $item->created_at->format('Y-m-d');
         })->map(function ($row) {
             return $row->sum('amount');
         })->toArray();
 
-        $ordersByMonth = $orders->where('created_at', '>=', date('Y-01-01', strtotime('-1 years')))->groupBy(function ($item) {
+        $ordersByMonth = $orders->groupBy(function ($item) {
             return $item->created_at->format('Y-m');
         })->map(function ($row) {
             return $row->sum('amount');
diff --git a/app/Http/Controllers/Admin/TicketController.php b/app/Http/Controllers/Admin/TicketController.php
index 842b0f33..62e63a35 100644
--- a/app/Http/Controllers/Admin/TicketController.php
+++ b/app/Http/Controllers/Admin/TicketController.php
@@ -42,7 +42,7 @@ class TicketController extends Controller
         }
 
         if ($ticket = Ticket::create(['user_id' => $user->id, 'admin_id' => auth()->id(), 'title' => $data['title'], 'content' => clean($data['content'])])) {
-            $user->notify(new TicketCreated($ticket, route('replyTicket', $ticket)));
+            $user->notify(new TicketCreated($ticket, route('replyTicket', ['id' => $ticket->id])));
 
             return Response::json(['status' => 'success', 'message' => '工单创建成功']);
         }
@@ -71,7 +71,7 @@ class TicketController extends Controller
 
             // 通知用户
             if (sysConfig('ticket_replied_notification')) {
-                $ticket->user->notify(new TicketReplied($reply, route('replyTicket', $ticket), true));
+                $ticket->user->notify(new TicketReplied($reply, route('replyTicket', ['id' => $ticket->id]), true));
             }
 
             return Response::json(['status' => 'success', 'message' => '回复成功']);
@@ -88,7 +88,7 @@ class TicketController extends Controller
         }
         // 通知用户
         if (sysConfig('ticket_closed_notification')) {
-            $ticket->user->notify(new TicketClosed($ticket->id, $ticket->title, route('replyTicket', $ticket), \request('reason'), true));
+            $ticket->user->notify(new TicketClosed($ticket->id, $ticket->title, route('replyTicket', ['id' => $ticket->id]), \request('reason'), true));
         }
 
         return Response::json(['status' => 'success', 'message' => '关闭成功']);