From 6585376e3ade9129529de147be8ddd7eff8ea28e Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 17 Jan 2022 15:07:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0=E6=89=B9?=
 =?UTF-8?q?=E9=9B=B6=E7=B3=BB=E7=BB=9F=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/DealerOrderController.php     | 24 ++++++++++++++++++-
 app/Admin/routes.php                          |  1 +
 database/seeders/AdminMenuSeeder.php          |  5 ++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Controllers/DealerOrderController.php b/app/Admin/Controllers/DealerOrderController.php
index 3b290103..27b15eb2 100644
--- a/app/Admin/Controllers/DealerOrderController.php
+++ b/app/Admin/Controllers/DealerOrderController.php
@@ -14,6 +14,7 @@ use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Layout\Row;
 use Dcat\Admin\Show;
 use Dcat\Admin\Widgets\Box;
+use Illuminate\Support\Facades\Request;
 
 class DealerOrderController extends AdminController
 {
@@ -26,6 +27,13 @@ class DealerOrderController extends AdminController
     {
         $builder = DealerOrder::with(['user', 'consignor']);
         return Grid::make($builder, function (Grid $grid) {
+            $type = Request::input('type', '');
+            if ($type == 'manager') {
+                $grid->model()->where(function ($query) {
+                    return $query->where('consignor_id', 1)->orWhereNull('consignor_id');
+                });
+            }
+            $grid->setResource('dealer-orders');
             $grid->column('id')->sortable();
             $grid->column('sn');
             $grid->column('user.phone')->copyable();
@@ -65,12 +73,14 @@ class DealerOrderController extends AdminController
                 if ($actions->row->status == DealerOrderStatus::Confirming && Admin::user()->can('dcat.admin.dealers_orders.paid')) {
                     $actions->append(new DealerOrderPaid());
                 }
-                if ($actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealers_orders.shipping')) {
+                if ((empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealers_orders.shipping')) {
                     $actions->append(new DealerOrderShipping());
                 }
             });
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
+                $filter->equal('user.phone')->width(3);
+                $filter->equal('consignor.phone')->width(3);
                 // $filter->equal('id');
             });
         });
@@ -101,6 +111,18 @@ class DealerOrderController extends AdminController
                         DealerOrderStatus::Completed->value => 'success',
                         DealerOrderStatus::Cancelled->value => '#b3b9bf',
                     ]);
+                    //非（待确认，已取消）显示收款人信息
+                    if (!in_array($show->model()->order_status, [
+                        DealerOrderStatus::Pending->value, DealerOrderStatus::Cancelled->value,
+                    ])) {
+                        $show->divider();
+                        $show->field('pay_info')->as(function () {
+                            return $this->getConsignorPayInfo();
+                            // dd($this->getConsignorPayInfo());
+                        });
+                    }
+
+                    // $show->field('order_status')
                     $show->divider();
                     $show->field('consignee_name');
                     $show->field('consignee_telephone');
diff --git a/app/Admin/routes.php b/app/Admin/routes.php
index a0a4bee8..09507e49 100644
--- a/app/Admin/routes.php
+++ b/app/Admin/routes.php
@@ -167,6 +167,7 @@ Route::group([
     $router->resource('dealer-orders', 'DealerOrderController')->only([
         'index', 'show', 'edit', 'update',
     ])->names('dealer_orders');
+    $router->get('dealer-manager-orders', 'DealerOrderController@index')->name('dealer_orders.manager');
     $router->resource('dealer-users', 'DealerController')->only([
         'index',
     ])->names('dealers');
diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php
index d5749964..b301a6cc 100644
--- a/database/seeders/AdminMenuSeeder.php
+++ b/database/seeders/AdminMenuSeeder.php
@@ -304,6 +304,11 @@ class AdminMenuSeeder extends Seeder
                         'icon' => '',
                         'uri' => 'dealer-orders',
                     ],
+                    [
+                        'title' =>'系统订单',
+                        'icon' => '',
+                        'uri' => 'dealer-manager-orders?type=manager',
+                    ],
                     [
                         'title' =>'渠道补贴',
                         'icon'=>'',