diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php index 14cd6f1d..d0e823a0 100644 --- a/beike/Repositories/OrderRepo.php +++ b/beike/Repositories/OrderRepo.php @@ -57,6 +57,16 @@ class OrderRepo } + public static function getOrderByNumber($number, $customer) + { + $order = Order::query() + ->where('number', $number) + ->where('customer_id', $customer->id) + ->first(); + return $order; + } + + /** * @param array $data * @return Order diff --git a/beike/Shop/Http/Controllers/Account/OrderController.php b/beike/Shop/Http/Controllers/Account/OrderController.php index f9281c91..870a39c1 100644 --- a/beike/Shop/Http/Controllers/Account/OrderController.php +++ b/beike/Shop/Http/Controllers/Account/OrderController.php @@ -35,13 +35,11 @@ class OrderController extends Controller return view('account/order', $data); } - public function success(Request $request): View + public function success(Request $request, $number): View { - $orders = OrderRepo::getListByCustomer(current_customer()); - $data = [ - 'orders' => OrderList::collection($orders), - ]; - - return view('account/order_success', $data); + $customer = current_customer(); + $order = OrderRepo::getOrderByNumber($number, $customer); + dd($order); + return view('account/order_success', ['data' => $order]); } }