From c7dd798af3e8c207fc8709762bc162e385faee55 Mon Sep 17 00:00:00 2001
From: xboard <xboard@xboard.one>
Date: Sun, 26 Jan 2025 11:42:30 +0800
Subject: [PATCH] fix(ticket): correct knows issues

---
 .../Controllers/V2/Admin/TicketController.php    | 16 ++++++++++++----
 app/Http/Controllers/V2/Admin/UserController.php |  4 ++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/V2/Admin/TicketController.php b/app/Http/Controllers/V2/Admin/TicketController.php
index 79c9df9..039570f 100644
--- a/app/Http/Controllers/V2/Admin/TicketController.php
+++ b/app/Http/Controllers/V2/Admin/TicketController.php
@@ -55,9 +55,10 @@ class TicketController extends Controller
         if (!$ticket) {
             return $this->fail([400202, '工单不存在']);
         }
-
+        $ticket->user = UserController::transformUserData($ticket->user);
         $ticket->messages->each(function ($message) use ($ticket) {
             $message->is_me = $message->user_id !== $ticket->user_id;
+
         });
 
         return $this->success($ticket);
@@ -84,13 +85,20 @@ class TicketController extends Controller
             });
 
         $this->applyFiltersAndSorts($request, $ticketModel);
-
-        return response()->json($ticketModel
+        $tickets = $ticketModel
             ->latest('updated_at')
             ->paginate(
                 perPage: $request->integer('pageSize', 10),
                 page: $request->integer('current', 1)
-            ));
+            );
+        $tickets->getCollection()->transform(function ($ticket) {
+            $ticket->user = UserController::transformUserData($ticket->user);
+            return $ticket;
+        });
+        return response([
+            'data' => $tickets->items(),
+            'total' => $tickets->total()
+        ]);
     }
 
     public function reply(Request $request)
diff --git a/app/Http/Controllers/V2/Admin/UserController.php b/app/Http/Controllers/V2/Admin/UserController.php
index cddf3a6..9a919e3 100644
--- a/app/Http/Controllers/V2/Admin/UserController.php
+++ b/app/Http/Controllers/V2/Admin/UserController.php
@@ -160,7 +160,7 @@ class UserController extends Controller
             ->paginate($pageSize, ['*'], 'page', $current);
 
         $users->getCollection()->transform(function ($user) {
-            return $this->transformUserData($user);
+            return self::transformUserData($user);
         });
 
         return response([
@@ -175,7 +175,7 @@ class UserController extends Controller
      * @param User $user
      * @return User
      */
-    private function transformUserData(User $user): User
+    public static function transformUserData(User $user): User
     {
         $user->subscribe_url = Helper::getSubscribeUrl($user->token);
         $user->balance = $user->balance / 100;