fix(ticket): correct knows issues

cedar2025 · Jan 26, 2025 · c7dd798 · c7dd798
1 parent 0232bb9
commit c7dd798
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/app/Http/Controllers/V2/Admin/TicketController.php b/app/Http/Controllers/V2/Admin/TicketController.php
@@ -55,9 +55,10 @@ private function fetchTicketById(Request $request)
         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 @@ private function fetchTickets(Request $request)
             });
 
         $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
@@ -160,7 +160,7 @@ public function fetch(Request $request)
             ->paginate($pageSize, ['*'], 'page', $current);
 
         $users->getCollection()->transform(function ($user) {
-            return $this->transformUserData($user);
+            return self::transformUserData($user);
         });
 
         return response([
@@ -175,7 +175,7 @@ public function fetch(Request $request)
      * @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;