From ac751ecb3fd5b3c77b59f3bc32fca7fd237526fb Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Fri, 21 Jan 2022 10:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{Forms => Actions/Grid}/DealerOrderAllocate.php |  0
 app/Admin/Controllers/DealerEarningController.php   |  6 +++---
 app/Admin/Controllers/DealerOrderController.php     | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)
 rename app/Admin/{Forms => Actions/Grid}/DealerOrderAllocate.php (100%)

diff --git a/app/Admin/Forms/DealerOrderAllocate.php b/app/Admin/Actions/Grid/DealerOrderAllocate.php
similarity index 100%
rename from app/Admin/Forms/DealerOrderAllocate.php
rename to app/Admin/Actions/Grid/DealerOrderAllocate.php
diff --git a/app/Admin/Controllers/DealerEarningController.php b/app/Admin/Controllers/DealerEarningController.php
index 2b481ae2..c1530058 100644
--- a/app/Admin/Controllers/DealerEarningController.php
+++ b/app/Admin/Controllers/DealerEarningController.php
@@ -81,9 +81,9 @@ class DealerEarningController extends AdminController
             $grid->column('created_at')->sortable();
             $grid->actions(function (Grid\Displayers\Actions $actions) {
                 //如果不是渠道补贴添加详情显示
-                if ($actions->row->earningable_type != (new DealerChannelSubsidyLog())->getMorphClass()) {
-                    $actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('dealer_earnings.show', ['dealer_earning'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 &nbsp;&nbsp;</a>');
-                }
+                // if ($actions->row->earningable_type != (new DealerChannelSubsidyLog())->getMorphClass()) {
+                $actions->append('<a style="cursor: pointer;" target="_blank" href="'.admin_route('dealer_earnings.show', ['dealer_earning'=>$actions->row]).'"><i class="feather icon-eye"></i> 显示 &nbsp;&nbsp;</a>');
+                // }
             });
 
             $grid->filter(function (Grid\Filter $filter) {
diff --git a/app/Admin/Controllers/DealerOrderController.php b/app/Admin/Controllers/DealerOrderController.php
index 87750aa8..7f71d5ac 100644
--- a/app/Admin/Controllers/DealerOrderController.php
+++ b/app/Admin/Controllers/DealerOrderController.php
@@ -74,11 +74,14 @@ class DealerOrderController extends AdminController
                 if (!(empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Pending && Admin::user()->can('dcat.admin.dealer_orders.allocate')) {
                     $actions->append(new DealerOrderAllocate());
                 }
-                if ($actions->row->status == DealerOrderStatus::Confirming && Admin::user()->can('dcat.admin.dealer_orders.paid')) {
-                    $actions->append(new DealerOrderPaid());
-                }
-                if ((empty($actions->row->consignor) || $actions->row->consignor_id == 1) && $actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealer_orders.shipping')) {
-                    $actions->append(new DealerOrderShipping());
+
+                if ((empty($actions->row->consignor) || $actions->row->consignor_id == 1)) {
+                    if ($actions->row->status == DealerOrderStatus::Confirming && Admin::user()->can('dcat.admin.dealer_orders.paid')) {
+                        $actions->append(new DealerOrderPaid());
+                    }
+                    if ($actions->row->status == DealerOrderStatus::Paid && Admin::user()->can('dcat.admin.dealer_orders.shipping')) {
+                        $actions->append(new DealerOrderShipping());
+                    }
                 }
             });
             $grid->filter(function (Grid\Filter $filter) {