From 118ecbddbca183efb9b79e156f917b3aa77b36af Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 20 Jan 2022 15:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/DealerController.php    |  4 +--
 .../Controllers/DealerEarningController.php   |  3 ++-
 database/seeders/AdminPermissionSeeder.php    | 27 +++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/DealerController.php b/app/Admin/Controllers/DealerController.php
index d8acf54a..341c19db 100644
--- a/app/Admin/Controllers/DealerController.php
+++ b/app/Admin/Controllers/DealerController.php
@@ -41,7 +41,7 @@ class DealerController extends AdminController
             });
             $grid->column('is_sale')
                 ->if(function () {
-                    return Admin::user()->can('dcat.admin.dealers.edit');
+                    return Admin::user()->can('dcat.admin.dealers.update');
                 })
                 ->then(function (Column $column) {
                     $column->switch();
@@ -51,7 +51,7 @@ class DealerController extends AdminController
                 });
             $grid->column('is_manager')
                 ->if(function () {
-                    return Admin::user()->can('dcat.admin.dealers.edit');
+                    return Admin::user()->can('dcat.admin.dealers.update');
                 })
                 ->then(function (Column $column) {
                     $column->switch();
diff --git a/app/Admin/Controllers/DealerEarningController.php b/app/Admin/Controllers/DealerEarningController.php
index 6124c04b..2b481ae2 100644
--- a/app/Admin/Controllers/DealerEarningController.php
+++ b/app/Admin/Controllers/DealerEarningController.php
@@ -13,6 +13,7 @@ use App\Models\DealerManageSubsidy;
 use App\Models\DealerManageSubsidyLog;
 use App\Models\DealerPurchaseSubsidy;
 use App\Models\DealerPurchaseSubsidyLog;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
@@ -180,7 +181,7 @@ class DealerEarningController extends AdminController
                         ->tools(function (Show\Tools $tools) use ($show) {
                             $tools->disableEdit();
                             $tools->disableDelete();
-                            if ($show->model()->status == DealerEarningStatus::Pending) {
+                            if ($show->model()->status == DealerEarningStatus::Pending && Admin::user()->can('dcat.admin.dealer_earnings.pay')) {
                                 if (!$show->model()->payer_id || $show->model()->payer_id == 1) {
                                     $tools->append(new DealerEarningPay());
                                 }
diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php
index 8b99ecf8..c54b635e 100644
--- a/database/seeders/AdminPermissionSeeder.php
+++ b/database/seeders/AdminPermissionSeeder.php
@@ -282,6 +282,33 @@ class AdminPermissionSeeder extends Seeder
                 'name' =>'导入记录',
                 'curd'=>['index'],
             ],
+            'dealers' =>[
+                'name' =>'经销商管理',
+                'curd'=>['index, show, update'],
+                'children'=>[
+                    'edit_lvl'=>['name' =>'修改经销商等级'],
+                    'bonds'=>['name' =>'填写保证金'],
+                ],
+            ],
+            'dealer_products'=>[
+                'name'=>'批零商品',
+                'curd'=> true,
+            ],
+            'dealer_orders'=>[
+                'name' =>'批零订单',
+                'curd' => ['index', 'show'],
+                'children' =>[
+                    'paid'=>['name' =>'确认收款'],
+                    'shipping'=>['name' =>'确认发货'],
+                ],
+            ],
+            'dealer-earnings'=>[
+                'name' =>'资金管理',
+                'curd' => ['index', 'show'],
+                'children' => [
+                    'pay'=>['name' =>'确认打款'],
+                ],
+            ],
         ];
         try {
             DB::begintransaction();