Ver Fonte

feat:订单管理->获取订单详情

刘学玺 há 4 meses atrás
pai
commit
3e0bd2cc21

+ 1 - 1
app/Http/Controllers/Client/OrderController.php

@@ -163,7 +163,7 @@ class OrderController extends Controller
      */
     public function detail($id)
     {
-        return $this->service->getOrderDetail($id);
+        return $this->service->getOrderDetail(Auth::user()->id, $id);
     }
 
     /**

+ 8 - 13
app/Services/Client/OrderService.php

@@ -480,21 +480,16 @@ class OrderService
     /**
      * 获取订单详情
      */
-    public function getOrderDetail($orderId)
+    public function getOrderDetail($userId, $orderId)
     {
-        $userId = Auth::id();
+        $user = MemberUser::find($userId);
 
-        return Order::where('id', $orderId)
-            ->where('user_id', $userId)
-            ->with([
-                'project:id,title,cover,price,duration',
-                'coach:id,name,avatar,mobile',
-                'agent:id,company_name',
-                'address:id,address,latitude,longitude',
-                'records' => function ($query) {
-                    $query->orderBy('created_at', 'asc');
-                },
-            ])
+        return $user->orders()->with([
+            'coach.info:id,nickname,avatar,gender',
+            'records' => function ($query) {
+                $query->orderBy('created_at', 'asc');
+            },
+        ])
             ->firstOrFail();
     }