From ac998c036c14d1faafa150e2cfec25ca9f68899a Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Fri, 20 May 2022 11:13:12 +0800
Subject: [PATCH] admin user

---
 README.md                                |  8 ++++++--
 app/Admin/Controllers/UserController.php | 14 +++++++-------
 resources/lang/zh_CN/user.php            |  4 ++--
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 9393fa9d..d9158610 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,14 @@
 
 - php >= 8.0
 
-
 ## Step
 
 - `composer install`
 - `cp .env.example .env`, 并修改配置文件
 - `php artisan migrate --seed`
-- `php artisan storage:link`
\ No newline at end of file
+- `php artisan storage:link`
+
+### 定时任务
+
+- 自动取消未支付的订单: `php artisan order:close-expired`, 常驻内存执行(死循环)
+- 自动完成待收货的订单: `php artisan order:complete`, 常驻内存执行(死循环)
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index c72cb3e5..033d2294 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -53,9 +53,9 @@ class UserController extends AdminController
                 });
             });
             $grid->column('phone')->copyable();
-            $grid->column('user_info.code')->copyable();
-            $grid->column('user_info.inviterInfo.user.phone')->copyable();
-            $grid->column('user_info.growth_value')->filter(
+            $grid->column('userInfo.code')->copyable();
+            $grid->column('userInfo.inviterInfo.user.phone')->copyable();
+            $grid->column('userInfo.growth_value')->filter(
                 Grid\Column\Filter\Between::make()
             )->modal(function ($modal) {
                 $modal->title('成长值');
@@ -81,7 +81,7 @@ class UserController extends AdminController
             //     PriceBetween::make()
             // );
 
-            $grid->column('user_info.is_company')->bool();
+            $grid->column('userInfo.is_company', '员工')->bool();
             $grid->column('created_at')->sortable();
             $grid->column('status')->using([-1=>'冻结', 1=>'正常', 2=>'禁用'])
                 ->dot([
@@ -157,14 +157,14 @@ class UserController extends AdminController
                             return $this->agent ? $this->agent->name . '(' .$this->agent->ratio. '%)' : '';
                         })->badge();
                         $show->width(6)->field('phone');
-                        $show->field('user_info.inviter_info.user.phone');
+                        $show->field('user_info.inviter_info.user.phone', '邀请人');
                         // $show->field('userInfo.nickname');
                         // $show->field('userInfo.gender')->using(UserInfo::$genderTexts)->label();
                         // $show->field('userInfo.birthday');
 
-                        $show->field('user_info.growth_value');
+                        $show->field('user_info.growth_value', '成长值');
                         $show->field('profit');
-                        $show->field('user_info.is_company')->as(function ($v) {
+                        $show->field('inviter_info.is_company', '员工')->as(function ($v) {
                             return $v ? '是' : '否';
                         });
                         $show->field('vip_expired');
diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php
index b2757c93..b6b6a612 100644
--- a/resources/lang/zh_CN/user.php
+++ b/resources/lang/zh_CN/user.php
@@ -17,7 +17,7 @@ return [
         'register_ip' => '注册IP',
         'created_at' => '注册时间',
         'agent' => '代理',
-        'user_info'=>[
+        'userInfo'=>[
             'code' => '邀请码',
             'avatar' => '头像',
             'nickname' => '昵称',
@@ -25,7 +25,7 @@ return [
             'points'=>'积分',
             'gender'=>'性别',
             'birthday'=>'生日',
-            'inviter_info'=>[
+            'inviterInfo'=>[
                 'user'=>[
                     'phone' =>'推荐人',
                 ],