From 29d3c3fb3d14f6e71ce530f152f3a2d42332c567 Mon Sep 17 00:00:00 2001
From: xuanchen <122383162@qq.com>
Date: Wed, 2 Sep 2020 16:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A6=E5=8F=98=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Account/LogController.php     | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/Admin/Controllers/Account/LogController.php b/app/Admin/Controllers/Account/LogController.php
index 7b95a88..a7872f4 100644
--- a/app/Admin/Controllers/Account/LogController.php
+++ b/app/Admin/Controllers/Account/LogController.php
@@ -3,6 +3,8 @@
 namespace App\Admin\Controllers\Account;
 
 use App\Models\AccountLog;
+use App\Models\User;
+use App\Models\AccountRule;
 use Encore\Admin\Controllers\AdminController;
 use Encore\Admin\Grid;
 
@@ -13,7 +15,8 @@ class LogController extends AdminController
 
     function grid()
     {
-        $grid   = new Grid(new AccountLog);
+        $grid = new Grid(new AccountLog);
+        $grid->model()->latest();
         $userId = request()->user_id;
         $grid->model()->when($userId, function ($query, $userId) {
             $query->where('user_id', $userId);
@@ -24,19 +27,20 @@ class LogController extends AdminController
 
         $grid->filter(function ($filter) {
             $filter->column(1 / 3, function ($filter) {
-                $filter->like('rule.title', '触发规则');
+                $filter->equal('rule_id', '触发规则')->select(AccountRule::pluck('title', 'id'));
                 $filter->equal('type', '账户类型')->select(config('account.account_type'));
             });
-            //            $filter->column(1 / 3, function ($filter) {
-            //                $filter->where(function ($query) {
-            //                    $query->whereHas('user', function ($query) {
-            //                        $query->whereHas('info', function ($query) {
-            //                            $query->where('nickname', 'like', "%{$this->input}%");
-            //                        });
-            //                    });
-            //                }, '会员姓名');
-            //                $filter->between('variable', '变量');
-            //            });
+            $filter->column(1 / 3, function ($filter) {
+                $filter->where(function ($query) {
+                    $query->whereHas('account', function ($query) {
+                        $query->whereHasMorph('accountable', 'App\Models\User', function ($query) {
+                            $query->where('id', $this->input);
+                        });
+                    });
+                }, '会员账号', 'id')->select(User::whereHas('identity', function ($q) {
+                    $q->where('identity_id', 1);
+                })->get()->pluck('info.nickname', 'id'));
+            });
             $filter->column(1 / 3, function ($filter) {
                 $filter->equal('frozen', '冻结')->select([
                     0 => '否',
@@ -46,10 +50,15 @@ class LogController extends AdminController
             });
         });
 
-        //        $grid->column('user.username', '会员账号');
-        //        $grid->column('user.nickname', '会员姓名');
+        $grid->column('会员账号')->display(function () {
+            return $this->account->accountable->username;
+        });
+        $grid->column('会员昵称')->display(function () {
+            return $this->account->accountable->info->nickname;
+        });
         $grid->column('rule.title', '触发规则');
-        $grid->column('type', '类型')->using(config('account.account_type'));
+        $grid->column('type', '类型')
+             ->using(config('account.account_type'));
         $grid->column('variable', '变量');
         $grid->column('balance', '余额');
         $grid->column('frozen', '冻结')