From 7b29f6957f6833ef21c113241230ecdebd86f672 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Tue, 25 Jan 2022 10:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=A1=E7=90=86=E8=80=85?= =?UTF-8?q?=E6=B4=A5=E8=B4=B4=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/AdController.php | 2 +- app/Admin/Controllers/ArticleController.php | 4 +- .../Controllers/DealerEarningController.php | 6 +- .../DealerManagerSalesLogController.php | 86 +++++++++++++++++++ .../Controllers/DealerProductController.php | 4 +- .../Controllers/ProductCategoryController.php | 2 +- .../Controllers/ProductFeatureController.php | 2 +- app/Admin/Controllers/ShareBgController.php | 2 +- .../Repositories/DealerManagerSalesLog.php | 16 ++++ app/Admin/routes.php | 3 + app/Models/DealerManagerSalesLog.php | 5 ++ database/seeders/AdminMenuSeeder.php | 5 ++ dcat_admin_ide_helper.php | 16 +++- .../lang/zh_CN/dealer-manager-sales-log.php | 18 ++++ 14 files changed, 157 insertions(+), 14 deletions(-) create mode 100644 app/Admin/Controllers/DealerManagerSalesLogController.php create mode 100644 app/Admin/Repositories/DealerManagerSalesLog.php create mode 100644 resources/lang/zh_CN/dealer-manager-sales-log.php diff --git a/app/Admin/Controllers/AdController.php b/app/Admin/Controllers/AdController.php index 796065f1..0669a71a 100644 --- a/app/Admin/Controllers/AdController.php +++ b/app/Admin/Controllers/AdController.php @@ -108,7 +108,7 @@ class AdController extends AdminController ->move('ac/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload(); + ->autoUpload()->retainable(); $form->radio('jump_type')->options([ '0'=>__('admin_message.ad.jump_type.radio.0'), '1'=>__('admin_message.ad.jump_type.radio.1'), diff --git a/app/Admin/Controllers/ArticleController.php b/app/Admin/Controllers/ArticleController.php index 33621c9d..021f8dc6 100644 --- a/app/Admin/Controllers/ArticleController.php +++ b/app/Admin/Controllers/ArticleController.php @@ -128,14 +128,14 @@ class ArticleController extends AdminController ->move('articles/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload(); + ->autoUpload()->retainable(); $form->radio('media_type') ->when(1, function (Form $form) { $form->multipleImage('media_content1') ->move('articles/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload()->autoSave(false)->customFormat(function ($v) { + ->autoUpload()->autoSave(false)->retainable()->customFormat(function ($v) { $v = []; if ($this->model()->media_type == 1) { $v = json_decode($this->model()->media_content, true); diff --git a/app/Admin/Controllers/DealerEarningController.php b/app/Admin/Controllers/DealerEarningController.php index 633eaa64..4a18c275 100644 --- a/app/Admin/Controllers/DealerEarningController.php +++ b/app/Admin/Controllers/DealerEarningController.php @@ -107,6 +107,9 @@ class DealerEarningController extends AdminController $builder = DealerEarning::with(['user', 'payer']); $column->row(Show::make($id, $builder, function (Show $show) { $show->field('id'); + $show->field('type_name')->as(function () { + return $this->type_name; + })->label(); $show->field('user.phone'); // $show->field('earningable_type'); // $show->field('earningable_id'); @@ -203,10 +206,9 @@ class DealerEarningController extends AdminController $grid->column('order_completed_at', '结算时间'); $grid->disableCreateButton(); $grid->disableActions(); - $grid->disablePagination(); + // $grid->disablePagination(); }); break; - break; case DealerManageSubsidy::class://管理补贴 $builder = DealerManageSubsidyLog::with(['order', 'product'])->where('user_id', $earning->earningable->user_id)->whereBetween('order_completed_at', [$earning->earningable->start_at, $earning->earningable->end_at]); $grid = Grid::make($builder, function (Grid $grid) { diff --git a/app/Admin/Controllers/DealerManagerSalesLogController.php b/app/Admin/Controllers/DealerManagerSalesLogController.php new file mode 100644 index 00000000..d04849fd --- /dev/null +++ b/app/Admin/Controllers/DealerManagerSalesLogController.php @@ -0,0 +1,86 @@ +column('id')->sortable(); + $grid->column('user.phone', '手机号'); + $grid->column('lvl', '等级')->display(function () { + return $this->lvl->text(); + }); + $grid->column('order.sn', '订单编号'); + $grid->column('product.name', '商品名称'); + $grid->column('sales_volume', '销量'); + $grid->column('order_completed_at', '结算时间'); + $grid->column('created_at')->sortable(); + + $grid->disableCreateButton(); + $grid->disableActions(); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(false); + $filter->equal('user.phone', '手机号')->width(3); + $filter->between('order_completed_at', '结算时间')->dateTime()->width(7); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new DealerManagerSalesLog(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('order_id'); + $show->field('product_id'); + $show->field('lvl'); + $show->field('sales_volume'); + $show->field('order_completed_at'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new DealerManagerSalesLog(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('order_id'); + $form->text('product_id'); + $form->text('lvl'); + $form->text('sales_volume'); + $form->text('order_completed_at'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/DealerProductController.php b/app/Admin/Controllers/DealerProductController.php index 2e3f7f4d..cf9a2285 100644 --- a/app/Admin/Controllers/DealerProductController.php +++ b/app/Admin/Controllers/DealerProductController.php @@ -116,13 +116,13 @@ class DealerProductController extends AdminController ->saveFullUrl() ->removable(false) ->retainable() - ->autoUpload(); + ->autoUpload()->retainable(); $form->multipleImage('images') ->move('dealer-products/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) ->retainable() - ->autoUpload(); + ->autoUpload()->retainable(); $form->editor('description'); $form->currency('price')->symbol('￥')->required(); $form->currency('manager_subsidy')->symbol('￥')->required(); diff --git a/app/Admin/Controllers/ProductCategoryController.php b/app/Admin/Controllers/ProductCategoryController.php index e79ea055..d1ede5f6 100644 --- a/app/Admin/Controllers/ProductCategoryController.php +++ b/app/Admin/Controllers/ProductCategoryController.php @@ -114,7 +114,7 @@ class ProductCategoryController extends AdminController ->move('product-categories/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload(); + ->autoUpload()->retainable(); $form->switch('is_show'); $form->switch('is_recommend'); $form->number('sort')->min(0)->default(0); diff --git a/app/Admin/Controllers/ProductFeatureController.php b/app/Admin/Controllers/ProductFeatureController.php index 6b3e35db..7dbb2b94 100644 --- a/app/Admin/Controllers/ProductFeatureController.php +++ b/app/Admin/Controllers/ProductFeatureController.php @@ -84,7 +84,7 @@ class ProductFeatureController extends AdminController ->move('product-features/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload(); + ->autoUpload()->retainable(); $form->text('remarks'); $form->display('created_at'); diff --git a/app/Admin/Controllers/ShareBgController.php b/app/Admin/Controllers/ShareBgController.php index 89d561d9..f7218698 100644 --- a/app/Admin/Controllers/ShareBgController.php +++ b/app/Admin/Controllers/ShareBgController.php @@ -99,7 +99,7 @@ class ShareBgController extends AdminController ->move('share-bgs/'.Carbon::now()->toDateString()) ->saveFullUrl() ->removable(false) - ->autoUpload()->required(); + ->autoUpload()->retainable()->required(); $form->number('x')->min(0)->default(0)->required(); $form->number('y')->min(0)->default(0)->required(); $form->number('size')->min(0)->default(0)->required(); diff --git a/app/Admin/Repositories/DealerManagerSalesLog.php b/app/Admin/Repositories/DealerManagerSalesLog.php new file mode 100644 index 00000000..4b58783a --- /dev/null +++ b/app/Admin/Repositories/DealerManagerSalesLog.php @@ -0,0 +1,16 @@ +get('dealer-earnings-manager', 'DealerEarningController@index')->name('dealer_earnings.manager'); $router->get('dealer-earnings-purchase', 'DealerEarningController@index')->name('dealer_earnings.purchase'); + //批零明细 + $router->get('dealer-manager-sales-logs', 'DealerManagerSalesLogController@index')->name('dealer_manager_sales_logs.index'); + /** api接口 **/ $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories'); $router->get('api/product-group-details', 'ProductGroupController@details')->name('api.product_group_details'); diff --git a/app/Models/DealerManagerSalesLog.php b/app/Models/DealerManagerSalesLog.php index 264ddfdf..b3b011f0 100644 --- a/app/Models/DealerManagerSalesLog.php +++ b/app/Models/DealerManagerSalesLog.php @@ -24,6 +24,11 @@ class DealerManagerSalesLog extends Model 'order_completed_at', ]; + public function user() + { + return $this->belongsTo(User::class, 'user_id'); + } + /** * 此津贴所属订单 */ diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index 0c764369..c7e31554 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -334,6 +334,11 @@ class AdminMenuSeeder extends Seeder 'icon' => '', 'uri' => 'dealer-earnings-manager?filter-earningable_type[]=dealer_manager_subsidy', ], + [ + 'title'=>'管理者津贴明细', + 'icon' => '', + 'uri'=>'dealer-manager-sales-logs', + ], ], ], [ diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 06b2f6f0..ecd9147a 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -159,15 +159,17 @@ namespace Dcat\Admin { * @property Grid\Column|Collection change_amount * @property Grid\Column|Collection change_from_purchase_subsidy_id * @property Grid\Column|Collection purchase_subsidy_id + * @property Grid\Column|Collection change_sales_value * @property Grid\Column|Collection before_lvl * @property Grid\Column|Collection change_lvl * @property Grid\Column|Collection bonds * @property Grid\Column|Collection contracted_lvl_at + * @property Grid\Column|Collection self_sales_value + * @property Grid\Column|Collection team_sales_value * @property Grid\Column|Collection failed_reason * @property Grid\Column|Collection jobable_id * @property Grid\Column|Collection jobable_type * @property Grid\Column|Collection change_revenue - * @property Grid\Column|Collection change_sales_value * @property Grid\Column|Collection pre_income_id * @property Grid\Column|Collection pre_income_job_id * @property Grid\Column|Collection agent_level @@ -451,15 +453,17 @@ namespace Dcat\Admin { * @method Grid\Column|Collection change_amount(string $label = null) * @method Grid\Column|Collection change_from_purchase_subsidy_id(string $label = null) * @method Grid\Column|Collection purchase_subsidy_id(string $label = null) + * @method Grid\Column|Collection change_sales_value(string $label = null) * @method Grid\Column|Collection before_lvl(string $label = null) * @method Grid\Column|Collection change_lvl(string $label = null) * @method Grid\Column|Collection bonds(string $label = null) * @method Grid\Column|Collection contracted_lvl_at(string $label = null) + * @method Grid\Column|Collection self_sales_value(string $label = null) + * @method Grid\Column|Collection team_sales_value(string $label = null) * @method Grid\Column|Collection failed_reason(string $label = null) * @method Grid\Column|Collection jobable_id(string $label = null) * @method Grid\Column|Collection jobable_type(string $label = null) * @method Grid\Column|Collection change_revenue(string $label = null) - * @method Grid\Column|Collection change_sales_value(string $label = null) * @method Grid\Column|Collection pre_income_id(string $label = null) * @method Grid\Column|Collection pre_income_job_id(string $label = null) * @method Grid\Column|Collection agent_level(string $label = null) @@ -748,15 +752,17 @@ namespace Dcat\Admin { * @property Show\Field|Collection change_amount * @property Show\Field|Collection change_from_purchase_subsidy_id * @property Show\Field|Collection purchase_subsidy_id + * @property Show\Field|Collection change_sales_value * @property Show\Field|Collection before_lvl * @property Show\Field|Collection change_lvl * @property Show\Field|Collection bonds * @property Show\Field|Collection contracted_lvl_at + * @property Show\Field|Collection self_sales_value + * @property Show\Field|Collection team_sales_value * @property Show\Field|Collection failed_reason * @property Show\Field|Collection jobable_id * @property Show\Field|Collection jobable_type * @property Show\Field|Collection change_revenue - * @property Show\Field|Collection change_sales_value * @property Show\Field|Collection pre_income_id * @property Show\Field|Collection pre_income_job_id * @property Show\Field|Collection agent_level @@ -1040,15 +1046,17 @@ namespace Dcat\Admin { * @method Show\Field|Collection change_amount(string $label = null) * @method Show\Field|Collection change_from_purchase_subsidy_id(string $label = null) * @method Show\Field|Collection purchase_subsidy_id(string $label = null) + * @method Show\Field|Collection change_sales_value(string $label = null) * @method Show\Field|Collection before_lvl(string $label = null) * @method Show\Field|Collection change_lvl(string $label = null) * @method Show\Field|Collection bonds(string $label = null) * @method Show\Field|Collection contracted_lvl_at(string $label = null) + * @method Show\Field|Collection self_sales_value(string $label = null) + * @method Show\Field|Collection team_sales_value(string $label = null) * @method Show\Field|Collection failed_reason(string $label = null) * @method Show\Field|Collection jobable_id(string $label = null) * @method Show\Field|Collection jobable_type(string $label = null) * @method Show\Field|Collection change_revenue(string $label = null) - * @method Show\Field|Collection change_sales_value(string $label = null) * @method Show\Field|Collection pre_income_id(string $label = null) * @method Show\Field|Collection pre_income_job_id(string $label = null) * @method Show\Field|Collection agent_level(string $label = null) diff --git a/resources/lang/zh_CN/dealer-manager-sales-log.php b/resources/lang/zh_CN/dealer-manager-sales-log.php new file mode 100644 index 00000000..4bd0c8c6 --- /dev/null +++ b/resources/lang/zh_CN/dealer-manager-sales-log.php @@ -0,0 +1,18 @@ + [ + 'DealerManagerSalesLog' => '管理者津贴明细', + 'dealer-manager-sales-logs' => '管理者津贴明细', + ], + 'fields' => [ + 'user_id' => '用户手机号', + 'order_id' => '订单', + 'product_id' => '商品', + 'lvl' => '等级', + 'sales_volume' => '商品销量', + 'order_completed_at' => '订单完成时间', + ], + 'options' => [ + ], +];