From c90a503775447cf95a5b69d8b19b2b0b4b630869 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 1 Jun 2022 16:00:01 +0800
Subject: [PATCH] 1

---
 app/Admin/Controllers/OrderController.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 368b3a92..9e036e5f 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -51,7 +51,7 @@ class OrderController extends AdminController
                     throw new AuthorizationException('没有操作权限');
                 }
 
-                $query = OrderModel::with(['user.userInfo', 'products']);
+                $query = Order::with(['user.userInfo', 'products']);
 
                 $grid = $this->grid();
                 $grid->processFilter();
@@ -251,7 +251,7 @@ class OrderController extends AdminController
                 if (in_array($value['method'], ['paginate', 'get', 'orderBy', 'orderByDesc'], true)) {
                     return;
                 }
-        
+
                 $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []);
             });
             $count = $query->count();
@@ -289,7 +289,7 @@ class OrderController extends AdminController
     {
         return function (Row $row) use ($id) {
             $row->column(5, function ($column) use ($id) {
-                $builder = OrderModel::with(['user', 'userCoupon', 'tags', 'store'])->withCount('afterSales');
+                $builder = Order::with(['user', 'userCoupon', 'tags', 'store'])->withCount('afterSales');
                 $column->row(Show::make($id, $builder, function (Show $show) {
                     // $show->field('id');
                     $show->row(function (Show\Row $show) {
@@ -366,7 +366,7 @@ class OrderController extends AdminController
                             $tools->disableEdit();
                             $tools->disableDelete();
 
-                            if ($show->model()->status == OrderModel::STATUS_PENDING) {
+                            if ($show->model()->status == Order::STATUS_PENDING) {
                                 if (Admin::user()->can('dcat.admin.orders.reduce')) {
                                     $tools->append(new OrderReduce());
                                 }
@@ -495,7 +495,7 @@ class OrderController extends AdminController
                 $column->row(Box::make('订单商品', $productGrid));
                 $packagesBox = Box::make('发货包裹', $packageGrid);
                 //显示发货动作
-                $order = OrderModel::findOrFail($id);
+                $order = Order::findOrFail($id);
                 if ($order->isWaitShipping() || $order->isShipping()) {
                     $packagesBox->tool(new OrderCreatePackage($id));
                 }
@@ -579,7 +579,7 @@ class OrderController extends AdminController
     {
         $sn = $request->input('q');
 
-        $query = OrderModel::select('id', 'sn as text');
+        $query = Order::select('id', 'sn as text');
 
         if ($sn) {
             $query->where('sn', 'like', "%$sn%");
@@ -611,7 +611,7 @@ class OrderController extends AdminController
             $writer->addRow(WriterEntityFactory::createRowFromArray([
                 '订单编号', '下单手机号', '商品编号', '商品名称', '数量', '姓名', '电话', '地址', '下单时间', '快递公司', '发货单号', '发货数量',
             ]));
-            foreach (OrderModel::with('products', 'user')->needShipping()->cursor() as $order) {
+            foreach (Order::with('products', 'user')->needShipping()->cursor() as $order) {
                 foreach ($order->products as $product) {
                     if ($product->remain_quantity > 0) {
                         $writer->addRow(WriterEntityFactory::createRowFromArray([