From c22c66e6d7afcc32adee5d3e5f699e0052770896 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Tue, 5 Jul 2022 10:49:09 +0800
Subject: [PATCH] fixed order

---
 .../Http/Controllers/OrderController.php      | 34 +++++++++++++++++++
 beike/Admin/Routes/admin.php                  |  3 ++
 beike/Repositories/OrderRepo.php              | 14 +++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 beike/Admin/Http/Controllers/OrderController.php

diff --git a/beike/Admin/Http/Controllers/OrderController.php b/beike/Admin/Http/Controllers/OrderController.php
new file mode 100644
index 00000000..e03a1651
--- /dev/null
+++ b/beike/Admin/Http/Controllers/OrderController.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * OrderController.php
+ *
+ * @copyright  2022 opencart.cn - All Rights Reserved
+ * @link       http://www.guangdawangluo.com
+ * @author     Edward Yang <yangjin@opencart.cn>
+ * @created    2022-07-05 10:45:26
+ * @modified   2022-07-05 10:45:26
+ */
+
+namespace Beike\Admin\Http\Controllers;
+
+use Beike\Models\Order;
+use Beike\Repositories\OrderRepo;
+use Beike\Shop\Http\Resources\Account\OrderList;
+use Illuminate\Http\Request;
+
+class OrderController extends Controller
+{
+    public function index(Request $request)
+    {
+        $orders = OrderRepo::getListAll();
+        $data = [
+            'orders' => OrderList::collection($orders),
+        ];
+        return view('admin::account/order', $data);
+    }
+
+    public function show(Request $request, Order $order)
+    {
+        dd($order);
+    }
+}
diff --git a/beike/Admin/Routes/admin.php b/beike/Admin/Routes/admin.php
index c5d486cf..a0d4aa3a 100644
--- a/beike/Admin/Routes/admin.php
+++ b/beike/Admin/Routes/admin.php
@@ -25,6 +25,9 @@ Route::prefix('admin')
                 Route::resource('products', \Beike\Admin\Http\Controllers\ProductController::class);
                 Route::resource('currencies', \Beike\Admin\Http\Controllers\CurrencyController::class);
 
+                Route::get('orders', [\Beike\Admin\Http\Controllers\OrderController::class, 'index'])->name('orders.index');
+                Route::get('orders/{order}', [\Beike\Admin\Http\Controllers\OrderController::class, 'show'])->name('orders.show');
+
                 Route::get('settings', [\Beike\Admin\Http\Controllers\SettingController::class, 'index'])->name('settings.index');
 
                 Route::get('plugins', [\Beike\Admin\Http\Controllers\PluginController::class, 'index'])->name('plugins.index');
diff --git a/beike/Repositories/OrderRepo.php b/beike/Repositories/OrderRepo.php
index 9b9328e5..14cd6f1d 100644
--- a/beike/Repositories/OrderRepo.php
+++ b/beike/Repositories/OrderRepo.php
@@ -19,7 +19,19 @@ use Illuminate\Database\Eloquent\Builder;
 class OrderRepo
 {
     /**
-     * 获取订单列表
+     * 获取所有客户订单列表
+     *
+     * @return LengthAwarePaginator
+     */
+    public static function getListAll(): LengthAwarePaginator
+    {
+        $builder = self::getListBuilder();
+        return $builder->paginate();
+    }
+
+
+    /**
+     * 获取特定客户订单列表
      *
      * @param null $customer
      * @return LengthAwarePaginator