From eef271078fc0658bdcbb68e2a569754c43e78c9a Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Fri, 25 Feb 2022 17:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B6=88=E8=B4=B9=E5=80=BC=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/SalesValueLogController.php | 86 +++++++++ app/Admin/Controllers/UserController.php | 7 +- .../UserSalesValueLogSimpleTable.php | 56 ++++++ app/Admin/Repositories/SalesValueLog.php | 16 ++ app/Admin/routes.php | 4 + app/Models/SalesValueLog.php | 8 + dcat_admin_ide_helper.php | 172 ++++++++++-------- resources/lang/zh_CN/sales-value-log.php | 17 ++ 8 files changed, 289 insertions(+), 77 deletions(-) create mode 100644 app/Admin/Controllers/SalesValueLogController.php create mode 100644 app/Admin/Renderable/UserSalesValueLogSimpleTable.php create mode 100644 app/Admin/Repositories/SalesValueLog.php create mode 100644 resources/lang/zh_CN/sales-value-log.php diff --git a/app/Admin/Controllers/SalesValueLogController.php b/app/Admin/Controllers/SalesValueLogController.php new file mode 100644 index 00000000..7ad55fec --- /dev/null +++ b/app/Admin/Controllers/SalesValueLogController.php @@ -0,0 +1,86 @@ +column('id')->sortable(); + $grid->column('user.phone'); + $grid->column('user.userInfo.nickname'); + // $grid->column('order_id'); + // $grid->column('order_user_id'); + $grid->column('type')->using([ + 1=>'个人', + 2=>'团队', + ]); + $grid->column('change_sales_value'); + $grid->column('remarks'); + $grid->column('created_at'); + $grid->column('updated_at')->sortable(); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(false); + $filter->equal('user.phone')->width(3); + $filter->between('created_at')->dateTime()->width(7); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new SalesValueLog(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('order_id'); + $show->field('order_user_id'); + $show->field('type'); + $show->field('change_sales_value'); + $show->field('remarks'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new SalesValueLog(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('order_id'); + $form->text('order_user_id'); + $form->text('type'); + $form->text('change_sales_value'); + $form->text('remarks'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index c7604607..888db266 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -17,6 +17,7 @@ use App\Admin\Renderable\Grid\Filter\PriceBetween; use App\Admin\Renderable\UserBalanceLogSimpleTable; use App\Admin\Renderable\UserFansSimpleTable; use App\Admin\Renderable\UserInviterSimpleTable; +use App\Admin\Renderable\UserSalesValueLogSimpleTable; use App\Admin\Renderable\UserWalletLogSimpleTable; use App\Admin\Repositories\User; use App\Exceptions\BizException; @@ -66,7 +67,11 @@ class UserController extends AdminController $grid->column('userInfo.inviterInfo.user.phone')->copyable(); $grid->column('userInfo.growth_value')->filter( Grid\Column\Filter\Between::make() - ); + )->modal(function ($modal) { + $modal->title('消费值'); + return UserSalesValueLogSimpleTable::make(['id'=>$this->id]); + })->setHeaderAttributes(['style' => 'color:#5b69bc']); + ; $grid->column('userInfo.group_sales_value')->filter( Grid\Column\Filter\Between::make() ); diff --git a/app/Admin/Renderable/UserSalesValueLogSimpleTable.php b/app/Admin/Renderable/UserSalesValueLogSimpleTable.php new file mode 100644 index 00000000..5d44c41e --- /dev/null +++ b/app/Admin/Renderable/UserSalesValueLogSimpleTable.php @@ -0,0 +1,56 @@ +payload['id'] ?? 0; + $builder = SalesValueLog::query(); + return Grid::make($builder, function (Grid $grid) use ($userId) { + $grid->model()->where('user_id', $userId); + $grid->column('type')->using([ + 1=>'个人', + 2=>'团队', + ]); + $grid->column('change_sales_value', '变动'); + $grid->column('remarks', '备注'); + $grid->column('created_at', '创建时间')->sortable(); + // $grid->column('updated_at') + // $grid->withBorder(); + $grid->model()->orderBy('created_at', 'desc'); + // $grid->disableRefreshButton(); + $grid->disableActions(); + $grid->disableCreateButton(); + $grid->header(function ($collection) use ($grid) { + $query = SalesValueLog::query(); + + // 拿到表格筛选 where 条件数组进行遍历 + $grid->model()->getQueries()->unique()->each(function ($value) use (&$query) { + // dd($value); + if (in_array($value['method'], ['paginate', 'get', 'orderBy', 'orderByDesc'], true)) { + return; + } + + $query = call_user_func_array([$query, $value['method']], $value['arguments'] ?? []); + }); + // 查出统计数据 + $salesValue1 = (clone $query)->where('type', '1')->sum('change_sales_value'); + $salesValue2 = (clone $query)->where('type', '2')->sum('change_sales_value'); + // 自定义组件 + return "
个人消费值：".$salesValue1.'
团队消费值：'.$salesValue2.'
'; + }); + $grid->filter(function (Grid\Filter $filter) { + $filter->between('created_at', '时间')->date()->default([ + 'start'=>now()->subDays(30)->toDateString(), + 'end'=>now()->toDateString(), + ]); + }); + }); + } +} diff --git a/app/Admin/Repositories/SalesValueLog.php b/app/Admin/Repositories/SalesValueLog.php new file mode 100644 index 00000000..85a10305 --- /dev/null +++ b/app/Admin/Repositories/SalesValueLog.php @@ -0,0 +1,16 @@ +get('import-job-logs', 'ImportJobLogController@index')->name('import_job_logs.index'); + $router->resource('sales-value-logs', 'SalesValueLogController')->only( + ['index'] + )->names('sales_value_logs'); + //经销商 $router->resource('dealer-products', 'DealerProductController')->names('dealer_products'); diff --git a/app/Models/SalesValueLog.php b/app/Models/SalesValueLog.php index 630a7ade..681bd474 100644 --- a/app/Models/SalesValueLog.php +++ b/app/Models/SalesValueLog.php @@ -2,10 +2,13 @@ namespace App\Models; +use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\Model; class SalesValueLog extends Model { + use HasDateTimeFormatter; + public const TYPE_INDIVIDUAL = 1; public const TYPE_TEAM = 2; @@ -27,4 +30,9 @@ class SalesValueLog extends Model 'change_sales_value', 'remarks', ]; + + public function user() + { + return $this->belongsTo(User::class); + } } diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 6bc8486a..a2d41b6c 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -11,6 +11,7 @@ namespace Dcat\Admin { use Illuminate\Support\Collection; /** + * @property Grid\Column|Collection width * @property Grid\Column|Collection created_at * @property Grid\Column|Collection dimensions * @property Grid\Column|Collection id @@ -18,13 +19,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection key * @property Grid\Column|Collection name * @property Grid\Column|Collection updated_at - * @property Grid\Column|Collection address - * @property Grid\Column|Collection consignee - * @property Grid\Column|Collection is_default - * @property Grid\Column|Collection telephone - * @property Grid\Column|Collection user_id - * @property Grid\Column|Collection zone - * @property Grid\Column|Collection zone_id * @property Grid\Column|Collection detail * @property Grid\Column|Collection type * @property Grid\Column|Collection version @@ -40,6 +34,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection http_path * @property Grid\Column|Collection slug * @property Grid\Column|Collection role_id + * @property Grid\Column|Collection user_id * @property Grid\Column|Collection value * @property Grid\Column|Collection avatar * @property Grid\Column|Collection password @@ -64,6 +59,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection tracking_number * @property Grid\Column|Collection before_agent_level * @property Grid\Column|Collection change_agent_level + * @property Grid\Column|Collection remark * @property Grid\Column|Collection apk_link * @property Grid\Column|Collection cate * @property Grid\Column|Collection context @@ -96,9 +92,10 @@ namespace Dcat\Admin { * @property Grid\Column|Collection continue_click_times * @property Grid\Column|Collection last_click_at * @property Grid\Column|Collection coupon_id + * @property Grid\Column|Collection is_enable * @property Grid\Column|Collection ranges - * @property Grid\Column|Collection status * @property Grid\Column|Collection administrator_id + * @property Grid\Column|Collection status * @property Grid\Column|Collection task_id * @property Grid\Column|Collection limit * @property Grid\Column|Collection sent @@ -109,20 +106,20 @@ namespace Dcat\Admin { * @property Grid\Column|Collection use_start_at * @property Grid\Column|Collection lvl * @property Grid\Column|Collection order_completed_at - * @property Grid\Column|Collection remark * @property Grid\Column|Collection total_amount * @property Grid\Column|Collection earningable_id * @property Grid\Column|Collection earningable_type * @property Grid\Column|Collection fee * @property Grid\Column|Collection fee_rate - * @property Grid\Column|Collection is_manager * @property Grid\Column|Collection pay_at * @property Grid\Column|Collection pay_image * @property Grid\Column|Collection pay_info + * @property Grid\Column|Collection pay_way * @property Grid\Column|Collection payer_id * @property Grid\Column|Collection settle_at * @property Grid\Column|Collection total_earnings * @property Grid\Column|Collection end_at + * @property Grid\Column|Collection is_manager * @property Grid\Column|Collection is_settle * @property Grid\Column|Collection real_amount * @property Grid\Column|Collection start_at @@ -133,13 +130,16 @@ namespace Dcat\Admin { * @property Grid\Column|Collection price * @property Grid\Column|Collection qty * @property Grid\Column|Collection sale_price + * @property Grid\Column|Collection reason * @property Grid\Column|Collection allocated_at * @property Grid\Column|Collection consignee_address * @property Grid\Column|Collection consignee_name * @property Grid\Column|Collection consignee_telephone * @property Grid\Column|Collection consignee_zone * @property Grid\Column|Collection consignor_id + * @property Grid\Column|Collection out_trade_no * @property Grid\Column|Collection paied_time + * @property Grid\Column|Collection pay_sn * @property Grid\Column|Collection pay_time * @property Grid\Column|Collection settle_state * @property Grid\Column|Collection shipping_time @@ -160,8 +160,12 @@ namespace Dcat\Admin { * @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 dealer_price + * @property Grid\Column|Collection quantity + * @property Grid\Column|Collection sell_price * @property Grid\Column|Collection before_lvl * @property Grid\Column|Collection change_lvl + * @property Grid\Column|Collection revoke_id * @property Grid\Column|Collection account_amount * @property Grid\Column|Collection rate * @property Grid\Column|Collection service_amount @@ -187,7 +191,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection queue * @property Grid\Column|Collection uuid * @property Grid\Column|Collection job_id - * @property Grid\Column|Collection reason * @property Grid\Column|Collection fails * @property Grid\Column|Collection file * @property Grid\Column|Collection success @@ -197,7 +200,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection is_push * @property Grid\Column|Collection message_id * @property Grid\Column|Collection order_package_id - * @property Grid\Column|Collection quantity * @property Grid\Column|Collection checked_at * @property Grid\Column|Collection is_failed * @property Grid\Column|Collection last_news @@ -210,7 +212,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection gift_for_sku_id * @property Grid\Column|Collection reduced_amount * @property Grid\Column|Collection remain_quantity - * @property Grid\Column|Collection sell_price * @property Grid\Column|Collection sku_id * @property Grid\Column|Collection specs * @property Grid\Column|Collection spu_id @@ -220,10 +221,8 @@ namespace Dcat\Admin { * @property Grid\Column|Collection max * @property Grid\Column|Collection auto_complete_at * @property Grid\Column|Collection is_change + * @property Grid\Column|Collection is_settlable * @property Grid\Column|Collection note - * @property Grid\Column|Collection out_trade_no - * @property Grid\Column|Collection pay_sn - * @property Grid\Column|Collection pay_way * @property Grid\Column|Collection products_total_amount * @property Grid\Column|Collection shipping_fee * @property Grid\Column|Collection shipping_state @@ -244,7 +243,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection reviewer_id * @property Grid\Column|Collection buynote_id * @property Grid\Column|Collection cost_price - * @property Grid\Column|Collection growth_value * @property Grid\Column|Collection market_price * @property Grid\Column|Collection media * @property Grid\Column|Collection release_at @@ -262,14 +260,20 @@ namespace Dcat\Admin { * @property Grid\Column|Collection size * @property Grid\Column|Collection x * @property Grid\Column|Collection y + * @property Grid\Column|Collection address + * @property Grid\Column|Collection consignee + * @property Grid\Column|Collection is_default + * @property Grid\Column|Collection telephone + * @property Grid\Column|Collection zone + * @property Grid\Column|Collection zone_id * @property Grid\Column|Collection rule_id * @property Grid\Column|Collection template_id * @property Grid\Column|Collection zones * @property Grid\Column|Collection expires_at * @property Grid\Column|Collection phone + * @property Grid\Column|Collection socialite_id + * @property Grid\Column|Collection socialite_type * @property Grid\Column|Collection tag_id - * @property Grid\Column|Collection tag_log_id - * @property Grid\Column|Collection tag_log_type * @property Grid\Column|Collection taggable_id * @property Grid\Column|Collection taggable_type * @property Grid\Column|Collection bank_description @@ -289,6 +293,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection depth * @property Grid\Column|Collection gender * @property Grid\Column|Collection group_sales_value + * @property Grid\Column|Collection growth_value * @property Grid\Column|Collection inviter_id * @property Grid\Column|Collection nickname * @property Grid\Column|Collection pre_growth_value @@ -305,6 +310,7 @@ namespace Dcat\Admin { * @property Grid\Column|Collection register_ip * @property Grid\Column|Collection status_remark * + * @method Grid\Column|Collection width(string $label = null) * @method Grid\Column|Collection created_at(string $label = null) * @method Grid\Column|Collection dimensions(string $label = null) * @method Grid\Column|Collection id(string $label = null) @@ -312,13 +318,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection key(string $label = null) * @method Grid\Column|Collection name(string $label = null) * @method Grid\Column|Collection updated_at(string $label = null) - * @method Grid\Column|Collection address(string $label = null) - * @method Grid\Column|Collection consignee(string $label = null) - * @method Grid\Column|Collection is_default(string $label = null) - * @method Grid\Column|Collection telephone(string $label = null) - * @method Grid\Column|Collection user_id(string $label = null) - * @method Grid\Column|Collection zone(string $label = null) - * @method Grid\Column|Collection zone_id(string $label = null) * @method Grid\Column|Collection detail(string $label = null) * @method Grid\Column|Collection type(string $label = null) * @method Grid\Column|Collection version(string $label = null) @@ -334,6 +333,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection http_path(string $label = null) * @method Grid\Column|Collection slug(string $label = null) * @method Grid\Column|Collection role_id(string $label = null) + * @method Grid\Column|Collection user_id(string $label = null) * @method Grid\Column|Collection value(string $label = null) * @method Grid\Column|Collection avatar(string $label = null) * @method Grid\Column|Collection password(string $label = null) @@ -358,6 +358,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection tracking_number(string $label = null) * @method Grid\Column|Collection before_agent_level(string $label = null) * @method Grid\Column|Collection change_agent_level(string $label = null) + * @method Grid\Column|Collection remark(string $label = null) * @method Grid\Column|Collection apk_link(string $label = null) * @method Grid\Column|Collection cate(string $label = null) * @method Grid\Column|Collection context(string $label = null) @@ -390,9 +391,10 @@ namespace Dcat\Admin { * @method Grid\Column|Collection continue_click_times(string $label = null) * @method Grid\Column|Collection last_click_at(string $label = null) * @method Grid\Column|Collection coupon_id(string $label = null) + * @method Grid\Column|Collection is_enable(string $label = null) * @method Grid\Column|Collection ranges(string $label = null) - * @method Grid\Column|Collection status(string $label = null) * @method Grid\Column|Collection administrator_id(string $label = null) + * @method Grid\Column|Collection status(string $label = null) * @method Grid\Column|Collection task_id(string $label = null) * @method Grid\Column|Collection limit(string $label = null) * @method Grid\Column|Collection sent(string $label = null) @@ -403,20 +405,20 @@ namespace Dcat\Admin { * @method Grid\Column|Collection use_start_at(string $label = null) * @method Grid\Column|Collection lvl(string $label = null) * @method Grid\Column|Collection order_completed_at(string $label = null) - * @method Grid\Column|Collection remark(string $label = null) * @method Grid\Column|Collection total_amount(string $label = null) * @method Grid\Column|Collection earningable_id(string $label = null) * @method Grid\Column|Collection earningable_type(string $label = null) * @method Grid\Column|Collection fee(string $label = null) * @method Grid\Column|Collection fee_rate(string $label = null) - * @method Grid\Column|Collection is_manager(string $label = null) * @method Grid\Column|Collection pay_at(string $label = null) * @method Grid\Column|Collection pay_image(string $label = null) * @method Grid\Column|Collection pay_info(string $label = null) + * @method Grid\Column|Collection pay_way(string $label = null) * @method Grid\Column|Collection payer_id(string $label = null) * @method Grid\Column|Collection settle_at(string $label = null) * @method Grid\Column|Collection total_earnings(string $label = null) * @method Grid\Column|Collection end_at(string $label = null) + * @method Grid\Column|Collection is_manager(string $label = null) * @method Grid\Column|Collection is_settle(string $label = null) * @method Grid\Column|Collection real_amount(string $label = null) * @method Grid\Column|Collection start_at(string $label = null) @@ -427,13 +429,16 @@ namespace Dcat\Admin { * @method Grid\Column|Collection price(string $label = null) * @method Grid\Column|Collection qty(string $label = null) * @method Grid\Column|Collection sale_price(string $label = null) + * @method Grid\Column|Collection reason(string $label = null) * @method Grid\Column|Collection allocated_at(string $label = null) * @method Grid\Column|Collection consignee_address(string $label = null) * @method Grid\Column|Collection consignee_name(string $label = null) * @method Grid\Column|Collection consignee_telephone(string $label = null) * @method Grid\Column|Collection consignee_zone(string $label = null) * @method Grid\Column|Collection consignor_id(string $label = null) + * @method Grid\Column|Collection out_trade_no(string $label = null) * @method Grid\Column|Collection paied_time(string $label = null) + * @method Grid\Column|Collection pay_sn(string $label = null) * @method Grid\Column|Collection pay_time(string $label = null) * @method Grid\Column|Collection settle_state(string $label = null) * @method Grid\Column|Collection shipping_time(string $label = null) @@ -454,8 +459,12 @@ namespace Dcat\Admin { * @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 dealer_price(string $label = null) + * @method Grid\Column|Collection quantity(string $label = null) + * @method Grid\Column|Collection sell_price(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 revoke_id(string $label = null) * @method Grid\Column|Collection account_amount(string $label = null) * @method Grid\Column|Collection rate(string $label = null) * @method Grid\Column|Collection service_amount(string $label = null) @@ -481,7 +490,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection queue(string $label = null) * @method Grid\Column|Collection uuid(string $label = null) * @method Grid\Column|Collection job_id(string $label = null) - * @method Grid\Column|Collection reason(string $label = null) * @method Grid\Column|Collection fails(string $label = null) * @method Grid\Column|Collection file(string $label = null) * @method Grid\Column|Collection success(string $label = null) @@ -491,7 +499,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection is_push(string $label = null) * @method Grid\Column|Collection message_id(string $label = null) * @method Grid\Column|Collection order_package_id(string $label = null) - * @method Grid\Column|Collection quantity(string $label = null) * @method Grid\Column|Collection checked_at(string $label = null) * @method Grid\Column|Collection is_failed(string $label = null) * @method Grid\Column|Collection last_news(string $label = null) @@ -504,7 +511,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection gift_for_sku_id(string $label = null) * @method Grid\Column|Collection reduced_amount(string $label = null) * @method Grid\Column|Collection remain_quantity(string $label = null) - * @method Grid\Column|Collection sell_price(string $label = null) * @method Grid\Column|Collection sku_id(string $label = null) * @method Grid\Column|Collection specs(string $label = null) * @method Grid\Column|Collection spu_id(string $label = null) @@ -514,10 +520,8 @@ namespace Dcat\Admin { * @method Grid\Column|Collection max(string $label = null) * @method Grid\Column|Collection auto_complete_at(string $label = null) * @method Grid\Column|Collection is_change(string $label = null) + * @method Grid\Column|Collection is_settlable(string $label = null) * @method Grid\Column|Collection note(string $label = null) - * @method Grid\Column|Collection out_trade_no(string $label = null) - * @method Grid\Column|Collection pay_sn(string $label = null) - * @method Grid\Column|Collection pay_way(string $label = null) * @method Grid\Column|Collection products_total_amount(string $label = null) * @method Grid\Column|Collection shipping_fee(string $label = null) * @method Grid\Column|Collection shipping_state(string $label = null) @@ -538,7 +542,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection reviewer_id(string $label = null) * @method Grid\Column|Collection buynote_id(string $label = null) * @method Grid\Column|Collection cost_price(string $label = null) - * @method Grid\Column|Collection growth_value(string $label = null) * @method Grid\Column|Collection market_price(string $label = null) * @method Grid\Column|Collection media(string $label = null) * @method Grid\Column|Collection release_at(string $label = null) @@ -556,14 +559,20 @@ namespace Dcat\Admin { * @method Grid\Column|Collection size(string $label = null) * @method Grid\Column|Collection x(string $label = null) * @method Grid\Column|Collection y(string $label = null) + * @method Grid\Column|Collection address(string $label = null) + * @method Grid\Column|Collection consignee(string $label = null) + * @method Grid\Column|Collection is_default(string $label = null) + * @method Grid\Column|Collection telephone(string $label = null) + * @method Grid\Column|Collection zone(string $label = null) + * @method Grid\Column|Collection zone_id(string $label = null) * @method Grid\Column|Collection rule_id(string $label = null) * @method Grid\Column|Collection template_id(string $label = null) * @method Grid\Column|Collection zones(string $label = null) * @method Grid\Column|Collection expires_at(string $label = null) * @method Grid\Column|Collection phone(string $label = null) + * @method Grid\Column|Collection socialite_id(string $label = null) + * @method Grid\Column|Collection socialite_type(string $label = null) * @method Grid\Column|Collection tag_id(string $label = null) - * @method Grid\Column|Collection tag_log_id(string $label = null) - * @method Grid\Column|Collection tag_log_type(string $label = null) * @method Grid\Column|Collection taggable_id(string $label = null) * @method Grid\Column|Collection taggable_type(string $label = null) * @method Grid\Column|Collection bank_description(string $label = null) @@ -583,6 +592,7 @@ namespace Dcat\Admin { * @method Grid\Column|Collection depth(string $label = null) * @method Grid\Column|Collection gender(string $label = null) * @method Grid\Column|Collection group_sales_value(string $label = null) + * @method Grid\Column|Collection growth_value(string $label = null) * @method Grid\Column|Collection inviter_id(string $label = null) * @method Grid\Column|Collection nickname(string $label = null) * @method Grid\Column|Collection pre_growth_value(string $label = null) @@ -604,6 +614,7 @@ namespace Dcat\Admin { class MiniGrid extends Grid {} /** + * @property Show\Field|Collection width * @property Show\Field|Collection created_at * @property Show\Field|Collection dimensions * @property Show\Field|Collection id @@ -611,13 +622,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection key * @property Show\Field|Collection name * @property Show\Field|Collection updated_at - * @property Show\Field|Collection address - * @property Show\Field|Collection consignee - * @property Show\Field|Collection is_default - * @property Show\Field|Collection telephone - * @property Show\Field|Collection user_id - * @property Show\Field|Collection zone - * @property Show\Field|Collection zone_id * @property Show\Field|Collection detail * @property Show\Field|Collection type * @property Show\Field|Collection version @@ -633,6 +637,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection http_path * @property Show\Field|Collection slug * @property Show\Field|Collection role_id + * @property Show\Field|Collection user_id * @property Show\Field|Collection value * @property Show\Field|Collection avatar * @property Show\Field|Collection password @@ -657,6 +662,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection tracking_number * @property Show\Field|Collection before_agent_level * @property Show\Field|Collection change_agent_level + * @property Show\Field|Collection remark * @property Show\Field|Collection apk_link * @property Show\Field|Collection cate * @property Show\Field|Collection context @@ -689,9 +695,10 @@ namespace Dcat\Admin { * @property Show\Field|Collection continue_click_times * @property Show\Field|Collection last_click_at * @property Show\Field|Collection coupon_id + * @property Show\Field|Collection is_enable * @property Show\Field|Collection ranges - * @property Show\Field|Collection status * @property Show\Field|Collection administrator_id + * @property Show\Field|Collection status * @property Show\Field|Collection task_id * @property Show\Field|Collection limit * @property Show\Field|Collection sent @@ -702,20 +709,20 @@ namespace Dcat\Admin { * @property Show\Field|Collection use_start_at * @property Show\Field|Collection lvl * @property Show\Field|Collection order_completed_at - * @property Show\Field|Collection remark * @property Show\Field|Collection total_amount * @property Show\Field|Collection earningable_id * @property Show\Field|Collection earningable_type * @property Show\Field|Collection fee * @property Show\Field|Collection fee_rate - * @property Show\Field|Collection is_manager * @property Show\Field|Collection pay_at * @property Show\Field|Collection pay_image * @property Show\Field|Collection pay_info + * @property Show\Field|Collection pay_way * @property Show\Field|Collection payer_id * @property Show\Field|Collection settle_at * @property Show\Field|Collection total_earnings * @property Show\Field|Collection end_at + * @property Show\Field|Collection is_manager * @property Show\Field|Collection is_settle * @property Show\Field|Collection real_amount * @property Show\Field|Collection start_at @@ -726,13 +733,16 @@ namespace Dcat\Admin { * @property Show\Field|Collection price * @property Show\Field|Collection qty * @property Show\Field|Collection sale_price + * @property Show\Field|Collection reason * @property Show\Field|Collection allocated_at * @property Show\Field|Collection consignee_address * @property Show\Field|Collection consignee_name * @property Show\Field|Collection consignee_telephone * @property Show\Field|Collection consignee_zone * @property Show\Field|Collection consignor_id + * @property Show\Field|Collection out_trade_no * @property Show\Field|Collection paied_time + * @property Show\Field|Collection pay_sn * @property Show\Field|Collection pay_time * @property Show\Field|Collection settle_state * @property Show\Field|Collection shipping_time @@ -753,8 +763,12 @@ namespace Dcat\Admin { * @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 dealer_price + * @property Show\Field|Collection quantity + * @property Show\Field|Collection sell_price * @property Show\Field|Collection before_lvl * @property Show\Field|Collection change_lvl + * @property Show\Field|Collection revoke_id * @property Show\Field|Collection account_amount * @property Show\Field|Collection rate * @property Show\Field|Collection service_amount @@ -780,7 +794,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection queue * @property Show\Field|Collection uuid * @property Show\Field|Collection job_id - * @property Show\Field|Collection reason * @property Show\Field|Collection fails * @property Show\Field|Collection file * @property Show\Field|Collection success @@ -790,7 +803,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection is_push * @property Show\Field|Collection message_id * @property Show\Field|Collection order_package_id - * @property Show\Field|Collection quantity * @property Show\Field|Collection checked_at * @property Show\Field|Collection is_failed * @property Show\Field|Collection last_news @@ -803,7 +815,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection gift_for_sku_id * @property Show\Field|Collection reduced_amount * @property Show\Field|Collection remain_quantity - * @property Show\Field|Collection sell_price * @property Show\Field|Collection sku_id * @property Show\Field|Collection specs * @property Show\Field|Collection spu_id @@ -813,10 +824,8 @@ namespace Dcat\Admin { * @property Show\Field|Collection max * @property Show\Field|Collection auto_complete_at * @property Show\Field|Collection is_change + * @property Show\Field|Collection is_settlable * @property Show\Field|Collection note - * @property Show\Field|Collection out_trade_no - * @property Show\Field|Collection pay_sn - * @property Show\Field|Collection pay_way * @property Show\Field|Collection products_total_amount * @property Show\Field|Collection shipping_fee * @property Show\Field|Collection shipping_state @@ -837,7 +846,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection reviewer_id * @property Show\Field|Collection buynote_id * @property Show\Field|Collection cost_price - * @property Show\Field|Collection growth_value * @property Show\Field|Collection market_price * @property Show\Field|Collection media * @property Show\Field|Collection release_at @@ -855,14 +863,20 @@ namespace Dcat\Admin { * @property Show\Field|Collection size * @property Show\Field|Collection x * @property Show\Field|Collection y + * @property Show\Field|Collection address + * @property Show\Field|Collection consignee + * @property Show\Field|Collection is_default + * @property Show\Field|Collection telephone + * @property Show\Field|Collection zone + * @property Show\Field|Collection zone_id * @property Show\Field|Collection rule_id * @property Show\Field|Collection template_id * @property Show\Field|Collection zones * @property Show\Field|Collection expires_at * @property Show\Field|Collection phone + * @property Show\Field|Collection socialite_id + * @property Show\Field|Collection socialite_type * @property Show\Field|Collection tag_id - * @property Show\Field|Collection tag_log_id - * @property Show\Field|Collection tag_log_type * @property Show\Field|Collection taggable_id * @property Show\Field|Collection taggable_type * @property Show\Field|Collection bank_description @@ -882,6 +896,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection depth * @property Show\Field|Collection gender * @property Show\Field|Collection group_sales_value + * @property Show\Field|Collection growth_value * @property Show\Field|Collection inviter_id * @property Show\Field|Collection nickname * @property Show\Field|Collection pre_growth_value @@ -898,6 +913,7 @@ namespace Dcat\Admin { * @property Show\Field|Collection register_ip * @property Show\Field|Collection status_remark * + * @method Show\Field|Collection width(string $label = null) * @method Show\Field|Collection created_at(string $label = null) * @method Show\Field|Collection dimensions(string $label = null) * @method Show\Field|Collection id(string $label = null) @@ -905,13 +921,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection key(string $label = null) * @method Show\Field|Collection name(string $label = null) * @method Show\Field|Collection updated_at(string $label = null) - * @method Show\Field|Collection address(string $label = null) - * @method Show\Field|Collection consignee(string $label = null) - * @method Show\Field|Collection is_default(string $label = null) - * @method Show\Field|Collection telephone(string $label = null) - * @method Show\Field|Collection user_id(string $label = null) - * @method Show\Field|Collection zone(string $label = null) - * @method Show\Field|Collection zone_id(string $label = null) * @method Show\Field|Collection detail(string $label = null) * @method Show\Field|Collection type(string $label = null) * @method Show\Field|Collection version(string $label = null) @@ -927,6 +936,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection http_path(string $label = null) * @method Show\Field|Collection slug(string $label = null) * @method Show\Field|Collection role_id(string $label = null) + * @method Show\Field|Collection user_id(string $label = null) * @method Show\Field|Collection value(string $label = null) * @method Show\Field|Collection avatar(string $label = null) * @method Show\Field|Collection password(string $label = null) @@ -951,6 +961,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection tracking_number(string $label = null) * @method Show\Field|Collection before_agent_level(string $label = null) * @method Show\Field|Collection change_agent_level(string $label = null) + * @method Show\Field|Collection remark(string $label = null) * @method Show\Field|Collection apk_link(string $label = null) * @method Show\Field|Collection cate(string $label = null) * @method Show\Field|Collection context(string $label = null) @@ -983,9 +994,10 @@ namespace Dcat\Admin { * @method Show\Field|Collection continue_click_times(string $label = null) * @method Show\Field|Collection last_click_at(string $label = null) * @method Show\Field|Collection coupon_id(string $label = null) + * @method Show\Field|Collection is_enable(string $label = null) * @method Show\Field|Collection ranges(string $label = null) - * @method Show\Field|Collection status(string $label = null) * @method Show\Field|Collection administrator_id(string $label = null) + * @method Show\Field|Collection status(string $label = null) * @method Show\Field|Collection task_id(string $label = null) * @method Show\Field|Collection limit(string $label = null) * @method Show\Field|Collection sent(string $label = null) @@ -996,20 +1008,20 @@ namespace Dcat\Admin { * @method Show\Field|Collection use_start_at(string $label = null) * @method Show\Field|Collection lvl(string $label = null) * @method Show\Field|Collection order_completed_at(string $label = null) - * @method Show\Field|Collection remark(string $label = null) * @method Show\Field|Collection total_amount(string $label = null) * @method Show\Field|Collection earningable_id(string $label = null) * @method Show\Field|Collection earningable_type(string $label = null) * @method Show\Field|Collection fee(string $label = null) * @method Show\Field|Collection fee_rate(string $label = null) - * @method Show\Field|Collection is_manager(string $label = null) * @method Show\Field|Collection pay_at(string $label = null) * @method Show\Field|Collection pay_image(string $label = null) * @method Show\Field|Collection pay_info(string $label = null) + * @method Show\Field|Collection pay_way(string $label = null) * @method Show\Field|Collection payer_id(string $label = null) * @method Show\Field|Collection settle_at(string $label = null) * @method Show\Field|Collection total_earnings(string $label = null) * @method Show\Field|Collection end_at(string $label = null) + * @method Show\Field|Collection is_manager(string $label = null) * @method Show\Field|Collection is_settle(string $label = null) * @method Show\Field|Collection real_amount(string $label = null) * @method Show\Field|Collection start_at(string $label = null) @@ -1020,13 +1032,16 @@ namespace Dcat\Admin { * @method Show\Field|Collection price(string $label = null) * @method Show\Field|Collection qty(string $label = null) * @method Show\Field|Collection sale_price(string $label = null) + * @method Show\Field|Collection reason(string $label = null) * @method Show\Field|Collection allocated_at(string $label = null) * @method Show\Field|Collection consignee_address(string $label = null) * @method Show\Field|Collection consignee_name(string $label = null) * @method Show\Field|Collection consignee_telephone(string $label = null) * @method Show\Field|Collection consignee_zone(string $label = null) * @method Show\Field|Collection consignor_id(string $label = null) + * @method Show\Field|Collection out_trade_no(string $label = null) * @method Show\Field|Collection paied_time(string $label = null) + * @method Show\Field|Collection pay_sn(string $label = null) * @method Show\Field|Collection pay_time(string $label = null) * @method Show\Field|Collection settle_state(string $label = null) * @method Show\Field|Collection shipping_time(string $label = null) @@ -1047,8 +1062,12 @@ namespace Dcat\Admin { * @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 dealer_price(string $label = null) + * @method Show\Field|Collection quantity(string $label = null) + * @method Show\Field|Collection sell_price(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 revoke_id(string $label = null) * @method Show\Field|Collection account_amount(string $label = null) * @method Show\Field|Collection rate(string $label = null) * @method Show\Field|Collection service_amount(string $label = null) @@ -1074,7 +1093,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection queue(string $label = null) * @method Show\Field|Collection uuid(string $label = null) * @method Show\Field|Collection job_id(string $label = null) - * @method Show\Field|Collection reason(string $label = null) * @method Show\Field|Collection fails(string $label = null) * @method Show\Field|Collection file(string $label = null) * @method Show\Field|Collection success(string $label = null) @@ -1084,7 +1102,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection is_push(string $label = null) * @method Show\Field|Collection message_id(string $label = null) * @method Show\Field|Collection order_package_id(string $label = null) - * @method Show\Field|Collection quantity(string $label = null) * @method Show\Field|Collection checked_at(string $label = null) * @method Show\Field|Collection is_failed(string $label = null) * @method Show\Field|Collection last_news(string $label = null) @@ -1097,7 +1114,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection gift_for_sku_id(string $label = null) * @method Show\Field|Collection reduced_amount(string $label = null) * @method Show\Field|Collection remain_quantity(string $label = null) - * @method Show\Field|Collection sell_price(string $label = null) * @method Show\Field|Collection sku_id(string $label = null) * @method Show\Field|Collection specs(string $label = null) * @method Show\Field|Collection spu_id(string $label = null) @@ -1107,10 +1123,8 @@ namespace Dcat\Admin { * @method Show\Field|Collection max(string $label = null) * @method Show\Field|Collection auto_complete_at(string $label = null) * @method Show\Field|Collection is_change(string $label = null) + * @method Show\Field|Collection is_settlable(string $label = null) * @method Show\Field|Collection note(string $label = null) - * @method Show\Field|Collection out_trade_no(string $label = null) - * @method Show\Field|Collection pay_sn(string $label = null) - * @method Show\Field|Collection pay_way(string $label = null) * @method Show\Field|Collection products_total_amount(string $label = null) * @method Show\Field|Collection shipping_fee(string $label = null) * @method Show\Field|Collection shipping_state(string $label = null) @@ -1131,7 +1145,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection reviewer_id(string $label = null) * @method Show\Field|Collection buynote_id(string $label = null) * @method Show\Field|Collection cost_price(string $label = null) - * @method Show\Field|Collection growth_value(string $label = null) * @method Show\Field|Collection market_price(string $label = null) * @method Show\Field|Collection media(string $label = null) * @method Show\Field|Collection release_at(string $label = null) @@ -1149,14 +1162,20 @@ namespace Dcat\Admin { * @method Show\Field|Collection size(string $label = null) * @method Show\Field|Collection x(string $label = null) * @method Show\Field|Collection y(string $label = null) + * @method Show\Field|Collection address(string $label = null) + * @method Show\Field|Collection consignee(string $label = null) + * @method Show\Field|Collection is_default(string $label = null) + * @method Show\Field|Collection telephone(string $label = null) + * @method Show\Field|Collection zone(string $label = null) + * @method Show\Field|Collection zone_id(string $label = null) * @method Show\Field|Collection rule_id(string $label = null) * @method Show\Field|Collection template_id(string $label = null) * @method Show\Field|Collection zones(string $label = null) * @method Show\Field|Collection expires_at(string $label = null) * @method Show\Field|Collection phone(string $label = null) + * @method Show\Field|Collection socialite_id(string $label = null) + * @method Show\Field|Collection socialite_type(string $label = null) * @method Show\Field|Collection tag_id(string $label = null) - * @method Show\Field|Collection tag_log_id(string $label = null) - * @method Show\Field|Collection tag_log_type(string $label = null) * @method Show\Field|Collection taggable_id(string $label = null) * @method Show\Field|Collection taggable_type(string $label = null) * @method Show\Field|Collection bank_description(string $label = null) @@ -1176,6 +1195,7 @@ namespace Dcat\Admin { * @method Show\Field|Collection depth(string $label = null) * @method Show\Field|Collection gender(string $label = null) * @method Show\Field|Collection group_sales_value(string $label = null) + * @method Show\Field|Collection growth_value(string $label = null) * @method Show\Field|Collection inviter_id(string $label = null) * @method Show\Field|Collection nickname(string $label = null) * @method Show\Field|Collection pre_growth_value(string $label = null) diff --git a/resources/lang/zh_CN/sales-value-log.php b/resources/lang/zh_CN/sales-value-log.php new file mode 100644 index 00000000..11fe9654 --- /dev/null +++ b/resources/lang/zh_CN/sales-value-log.php @@ -0,0 +1,17 @@ + [ + 'SalesValueLog' => 'SalesValueLog', + 'sales-value-log' => 'SalesValueLog', + ], + 'fields' => [ + 'user_id' => '用户', + 'order_id' => '订单', + 'order_user_id' => '下单用户', + 'type' => '类型', + 'change_sales_value' => '变更销售值', + 'remarks' => '备注', + ], + 'options' => [ + ], +];