From 2a013b503731da03aa12a96826723ec7f5fd8c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Mon, 7 Mar 2022 15:24:49 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8E=E5=8F=B0=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=AE=A1=E7=90=86=E8=80=85=E6=B4=A5=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerManagerSubsidyController.php           |  9 +++++----
 app/Admin/Repositories/DealerManagerSubsidy.php  | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 app/Admin/Repositories/DealerManagerSubsidy.php

diff --git a/app/Admin/Controllers/DealerManagerSubsidyController.php b/app/Admin/Controllers/DealerManagerSubsidyController.php
index 5875b766..ffa4f236 100644
--- a/app/Admin/Controllers/DealerManagerSubsidyController.php
+++ b/app/Admin/Controllers/DealerManagerSubsidyController.php
@@ -4,9 +4,10 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Actions\Grid\DealerManagerSubsidyBatchPay;
 use App\Admin\Actions\Grid\DealerManagerSubsidyPay;
+use App\Admin\Repositories\DealerManagerSubsidy;
 use App\Admin\Widgets\InfoBox;
 use App\Enums\DealerManagerSubsidyStatus;
-use App\Models\DealerManagerSubsidy;
+use App\Models\DealerManagerSubsidy as DealerManagerSubsidyModel;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Http\Controllers\AdminController;
@@ -32,10 +33,10 @@ class DealerManagerSubsidyController extends AdminController
             CSS
         );
 
-        $builder = DealerManagerSubsidy::with(['dealer', 'user', 'userinfo', 'earning'])->settled();
+        $builder = DealerManagerSubsidy::with(['dealer', 'user', 'userinfo', 'earning']);
 
         return Grid::make($builder, function (Grid $grid) {
-            $grid->model()->orderBy('id', 'desc');
+            $grid->model()->settled()->orderBy('id', 'desc');
 
             $grid->column('settle_period', '结算周期')->display(function () {
                 return $this->start_at->rawFormat('Y/m/d') . '-' . $this->end_at->rawFormat('Y/m/d');
@@ -105,7 +106,7 @@ class DealerManagerSubsidyController extends AdminController
 
             $grid->header(function ($collection) use ($grid) {
                 return tap(new Row(), function ($row) use ($grid) {
-                    $query = DealerManagerSubsidy::query();
+                    $query = DealerManagerSubsidyModel::query();
 
                     $grid->model()->getQueries()->unique()->each(function ($value) use (&$query) {
                         if (in_array($value['method'], ['paginate', 'get', 'orderBy', 'orderByDesc'], true)) {
diff --git a/app/Admin/Repositories/DealerManagerSubsidy.php b/app/Admin/Repositories/DealerManagerSubsidy.php
new file mode 100644
index 00000000..02b314a2
--- /dev/null
+++ b/app/Admin/Repositories/DealerManagerSubsidy.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\DealerManagerSubsidy as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class DealerManagerSubsidy extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}