From 267b72d7f2460e8236407c86a9b7fa127b84cd0c Mon Sep 17 00:00:00 2001 From: liapples Date: Sat, 11 Sep 2021 09:54:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MiniProgramDraftController.php | 17 ++++++------ .../Controllers/MiniProgramListController.php | 5 ++-- .../MiniProgramTemplateController.php | 19 +++++++------- resources/lang/zh_CN/mini-program.php | 26 +++++++++++++++++++ 4 files changed, 48 insertions(+), 19 deletions(-) create mode 100644 resources/lang/zh_CN/mini-program.php diff --git a/app/Admin/Controllers/MiniProgramDraftController.php b/app/Admin/Controllers/MiniProgramDraftController.php index b9f69e0..f32f4e7 100644 --- a/app/Admin/Controllers/MiniProgramDraftController.php +++ b/app/Admin/Controllers/MiniProgramDraftController.php @@ -12,20 +12,21 @@ use Dcat\Admin\Http\Controllers\AdminController; */ class MiniProgramDraftController extends AdminController { - protected $title = '小程序草稿箱'; + protected $translation = 'mini-program'; protected function grid(): Grid { return Grid::make(new MiniProgramDraft, function (Grid $grid) { $grid->disableCreateButton(); + $grid->disableRowSelector(); - $grid->column('draft_id', 'ID'); - $grid->column('user_version', '版本号'); - $grid->column('user_desc', '描述'); - $grid->column('source_miniprogram', '来源小程序'); - $grid->column('source_miniprogram_appid', '上传者微信号'); - $grid->column('developer', '上传者微信昵称'); - $grid->column('create_time', '创建时间')->display(fn($v) => date('Y-m-d H:i:s', $v)); + $grid->column('draft_id'); + $grid->column('user_version'); + $grid->column('user_desc'); + $grid->column('source_miniprogram'); + $grid->column('source_miniprogram_appid'); + $grid->column('developer'); + $grid->column('create_time')->display(fn($v) => date('Y-m-d H:i:s', $v)); }); } } diff --git a/app/Admin/Controllers/MiniProgramListController.php b/app/Admin/Controllers/MiniProgramListController.php index c0f3490..0a42a2b 100644 --- a/app/Admin/Controllers/MiniProgramListController.php +++ b/app/Admin/Controllers/MiniProgramListController.php @@ -12,14 +12,15 @@ use Dcat\Admin\Http\Controllers\AdminController; */ class MiniProgramListController extends AdminController { - protected $title = '小程序列表'; + protected $translation = 'mini-program'; protected function grid(): Grid { return Grid::make(new MiniProgramList, function (Grid $grid) { $grid->disableCreateButton(); + $grid->disableRowSelector(); - $grid->column('authorizer_appid', 'APPID'); + $grid->column('authorizer_appid'); }); } } diff --git a/app/Admin/Controllers/MiniProgramTemplateController.php b/app/Admin/Controllers/MiniProgramTemplateController.php index bcaacdd..f97b6d6 100644 --- a/app/Admin/Controllers/MiniProgramTemplateController.php +++ b/app/Admin/Controllers/MiniProgramTemplateController.php @@ -12,21 +12,22 @@ use Dcat\Admin\Http\Controllers\AdminController; */ class MiniProgramTemplateController extends AdminController { - protected $title = '小程序模板'; + protected $translation = 'mini-program'; protected function grid(): Grid { return Grid::make(new MiniProgramTemplate, function (Grid $grid) { $grid->disableCreateButton(); + $grid->disableRowSelector(); - $grid->column('template_id', 'ID'); - $grid->column('template_type', '模板类型')->using([0 => '普通模板', 1 => '标准模板']); - $grid->column('user_version', '版本号'); - $grid->column('user_desc', '描述'); - $grid->column('source_miniprogram', '来源小程序'); - $grid->column('source_miniprogram_appid', '上传者微信号'); - $grid->column('developer', '上传者微信昵称'); - $grid->column('create_time', '创建时间')->display(fn($v) => date('Y-m-d H:i:s', $v)); + $grid->column('template_id'); + $grid->column('template_type')->using([0 => '普通模板', 1 => '标准模板']); + $grid->column('user_version'); + $grid->column('user_desc'); + $grid->column('source_miniprogram'); + $grid->column('source_miniprogram_appid'); + $grid->column('developer'); + $grid->column('create_time')->display(fn($v) => date('Y-m-d H:i:s', $v)); }); } } diff --git a/resources/lang/zh_CN/mini-program.php b/resources/lang/zh_CN/mini-program.php new file mode 100644 index 0000000..ea79e3b --- /dev/null +++ b/resources/lang/zh_CN/mini-program.php @@ -0,0 +1,26 @@ + [ + 'MiniProgram' => '小程序', + 'mini-program' => '小程序', + 'mini_program' => '小程序', + 'MiniProgramDraft' => '小程序草稿箱', + 'MiniProgramTemplate' => '小程序模板', + 'MiniProgramList' => '小程序列表', + ], + 'fields' => [ + 'draft_id' => 'ID', + 'template_id' => 'ID', + 'user_version' => '版本号', + 'user_desc' => '描述', + 'source_miniprogram' => '来源小程序', + 'source_miniprogram_appid' => '上传者微信号', + 'developer' => '上传者微信昵称', + 'create_time' => '创建时间', + 'template_type' => '模板类型', + 'authorizer_appid' => 'APPID', + ], + 'options' => [ + ], +]; From 8449abea7e27724b0d51a3840ef8dd2cacab164a Mon Sep 17 00:00:00 2001 From: liapples Date: Sat, 11 Sep 2021 11:40:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9A=E5=8D=95=E8=B6=85=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Console/Commands/OrderTimeout.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Console/Commands/OrderTimeout.php b/app/Console/Commands/OrderTimeout.php index e943d2d..b0e383d 100644 --- a/app/Console/Commands/OrderTimeout.php +++ b/app/Console/Commands/OrderTimeout.php @@ -45,14 +45,15 @@ class OrderTimeout extends Command $status_arr = [OrderStatus::UNPAID, OrderStatus::PAY_EARNEST, OrderStatus::OFFLINE_UNPAID]; //记录最小ID，下次查询时按ID正序查询，只处理大于该ID的订单，避免重复扫描数据库 - $min_id = Order::query() + /*$min_id = Order::query() ->whereIn('status', $status_arr) ->whereNotNull('timeout') - ->min('id'); + ->min('id');*/ + $min_id = 0; while (true) { Order::query() - ->where('id', '>=', $min_id) +// ->where('id', '>=', $min_id) ->whereIn('status', $status_arr) ->whereNotNull('timeout') ->orderBy('id')