|
@@ -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();
|
|
|
}
|
|
|
|