From b44728be4ee7b3b79d9e2634e6e4a3271445b512 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Tue, 28 Dec 2021 16:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8E=E5=8F=B0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8F=90=E7=8E=B0=E6=89=93=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Actions/Grid/WalletToBankLogVerify.php | 44 +++++ .../Controllers/AppVersionController.php | 4 +- .../Controllers/CouponSendTaskController.php | 2 +- .../Controllers/ShippingRuleController.php | 10 +- .../Controllers/WalletToBankLogController.php | 109 +++++++++++++ app/Admin/Forms/WalletToBankLogVerify.php | 73 +++++++++ app/Admin/Repositories/WalletToBankLog.php | 16 ++ app/Admin/routes.php | 4 + app/Models/WalletToBankLog.php | 15 ++ database/seeders/AdminMenuSeeder.php | 17 ++ database/seeders/AdminPermissionSeeder.php | 7 + dcat_admin_ide_helper.php | 152 ++++++++++++------ resources/lang/zh_CN/product-spu.php | 7 + resources/lang/zh_CN/wallet-to-bank-log.php | 23 +++ 14 files changed, 423 insertions(+), 60 deletions(-) create mode 100644 app/Admin/Actions/Grid/WalletToBankLogVerify.php create mode 100644 app/Admin/Controllers/WalletToBankLogController.php create mode 100644 app/Admin/Forms/WalletToBankLogVerify.php create mode 100644 app/Admin/Repositories/WalletToBankLog.php create mode 100644 resources/lang/zh_CN/wallet-to-bank-log.php diff --git a/app/Admin/Actions/Grid/WalletToBankLogVerify.php b/app/Admin/Actions/Grid/WalletToBankLogVerify.php new file mode 100644 index 00000000..53beb034 --- /dev/null +++ b/app/Admin/Actions/Grid/WalletToBankLogVerify.php @@ -0,0 +1,44 @@ +'; + + public function title() + { + if ($this->title) { + return $this->title.' 审核'; + } + + return '审核'; + } + + /** + * @param Model|Authenticatable|HasPermissions|null $user + * + * @return bool + */ + protected function authorize($user): bool + { + return $user->can('dcat.admin.wallet_to_bank_logs.verify'); + } + + public function render() + { + $form = WalletToBankLogVerifyForm::make()->payload(['id'=>$this->getKey()]); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->title()); + } +} diff --git a/app/Admin/Controllers/AppVersionController.php b/app/Admin/Controllers/AppVersionController.php index 537f582f..db7462c1 100644 --- a/app/Admin/Controllers/AppVersionController.php +++ b/app/Admin/Controllers/AppVersionController.php @@ -97,7 +97,7 @@ class AppVersionController extends AdminController $form->number('v')->min(0); $form->radio('cate') ->when(1, function (Form $form) { - $form->text('apk_link1')->rules('required_if:cate,1'); + $form->text('apk_link1')->rules('required_if:cate,1', ['required_if'=>'苹果平台需要填写苹果商店地址']); }) ->when(2, function (Form $form) { $form->file('apk_link2')->chunked() @@ -107,7 +107,7 @@ class AppVersionController extends AdminController ->saveFullUrl() ->removable(false) ->autoSave(false) - ->autoUpload()->rules('required_if:cate,2')->customFormat(function ($v) { + ->autoUpload()->rules('required_if:cate,2', ['required_if'=>'安卓平台需要上传应用包'])->customFormat(function ($v) { if ($this->model()->cate == 2) { $v = $this->model()->apk_link; } diff --git a/app/Admin/Controllers/CouponSendTaskController.php b/app/Admin/Controllers/CouponSendTaskController.php index a5b07bcf..3666eafc 100644 --- a/app/Admin/Controllers/CouponSendTaskController.php +++ b/app/Admin/Controllers/CouponSendTaskController.php @@ -135,7 +135,7 @@ class CouponSendTaskController extends AdminController $v = $value['user_ids']; } return $v; - })->rules('required_if:type,1')->max(100)->help('单次最多选择100名用户'); + })->rules('required_if:type,1', ['required_if'=>'指定用户时必须选择一个用户'])->max(100)->help('单次最多选择100名用户'); })->default(1); $form->hidden('value'); diff --git a/app/Admin/Controllers/ShippingRuleController.php b/app/Admin/Controllers/ShippingRuleController.php index 8c7a793d..7cc09169 100644 --- a/app/Admin/Controllers/ShippingRuleController.php +++ b/app/Admin/Controllers/ShippingRuleController.php @@ -76,7 +76,7 @@ class ShippingRuleController extends AdminController $form->radio('type') ->when(1, function (Form $form) { $form->embeds('info1', function ($form) { - $form->text('threshold')->rules('required_if:type,1'); + $form->text('threshold')->rules('required_if:type,1', ['required_if'=>'请填写包邮门槛']); })->customFormat(function () { if ($this->model()->type == '1') { return $this->model()->info; @@ -87,10 +87,10 @@ class ShippingRuleController extends AdminController }) ->when(2, function (Form $form) { $form->embeds('info2', function ($form) { - $form->number('first_weight')->min(1)->rules('required_if:type,2')->default(2); - $form->currency('first_w_amount')->rules('required_if:type,2')->symbol('￥'); - $form->number('continue_weight')->min(1)->rules('required_if:type,2')->default(1); - $form->currency('continue_w_amount')->rules('required_if:type,2')->symbol('￥'); + $form->number('first_weight')->min(1)->rules('required_if:type,2', ['required_if'=>'请填写计费首重'])->default(2); + $form->currency('first_w_amount')->rules('required_if:type,2', ['required_if'=>'请填写首重价格'])->symbol('￥'); + $form->number('continue_weight')->min(1)->rules('required_if:type,2', ['required_if'=>'请填写计费续重'])->default(1); + $form->currency('continue_w_amount')->rules('required_if:type,2', ['required_if'=>'请填写续重价格'])->symbol('￥'); })->customFormat(function () { if ($this->model()->type == '2') { return $this->model()->info; diff --git a/app/Admin/Controllers/WalletToBankLogController.php b/app/Admin/Controllers/WalletToBankLogController.php new file mode 100644 index 00000000..9dff45f2 --- /dev/null +++ b/app/Admin/Controllers/WalletToBankLogController.php @@ -0,0 +1,109 @@ +column('id')->sortable(); + $grid->column('user.phone'); + $grid->column('bank_name'); + $grid->column('bank_number'); + $grid->column('bank_description'); + $grid->column('username'); + $grid->column('amount')->display(function ($v) { + return bcdiv($v, 100, 2); + })->prepend('￥'); + $grid->column('status')->using([ + WalletToBankLogModel::STATUS_PENDING=>'待处理', + WalletToBankLogModel::STATUS_AGREE=>'同意', + WalletToBankLogModel::STATUS_REFUSE=>'拒绝', + ])->dot([ + 0=>'primary', + 1=>'success', + 2=>'danger', + ]); + $grid->column('remarks'); + $grid->column('created_at')->sortable(); + + $grid->actions(function (Grid\Displayers\Actions $actions) { + if ($actions->row->status == 0 && Admin::user()->can('dcat.admin.wallet_to_bank_logs.verify')) { + $actions->append(new WalletToBankLogVerify()); + } + }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->equal('status')->select([ + WalletToBankLogModel::STATUS_PENDING=>'待处理', + WalletToBankLogModel::STATUS_AGREE=>'已同意', + WalletToBankLogModel::STATUS_REFUSE=>'已拒绝', + ])->width(3); + $filter->equal('user.phone')->width(3); + $filter->equal('username')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new WalletToBankLog(), function (Show $show) { + $show->field('id'); + $show->field('bank_name'); + $show->field('bank_number'); + $show->field('bank_description'); + $show->field('username'); + $show->field('amount'); + $show->field('status'); + $show->field('remarks'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new WalletToBankLog(), function (Form $form) { + $form->display('id'); + $form->text('bank_name'); + $form->text('bank_number'); + $form->text('bank_description'); + $form->text('username'); + $form->text('amount'); + $form->text('status'); + $form->text('remarks'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Forms/WalletToBankLogVerify.php b/app/Admin/Forms/WalletToBankLogVerify.php new file mode 100644 index 00000000..4db1ea7f --- /dev/null +++ b/app/Admin/Forms/WalletToBankLogVerify.php @@ -0,0 +1,73 @@ +can('dcat.admin.wallet_to_bank_logs.verify'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + $id = $this->payload['id'] ?? 0; + $log = WalletToBankLog::findOrFail($id); + try { + DB::beginTransaction(); + $log->update($input); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败：'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $id = $this->payload['id'] ?? 0; + $log = WalletToBankLog::findOrFail($id); + + + $this->text('bank_name')->value($log->bank_name)->disable(); + $this->text('bank_number')->value($log->bank_number)->disable(); + $this->text('username')->value($log->username)->disable(); + $this->text('bank_description')->value($log->bank_description)->disable(); + $this->currency('amount')->symbol('￥')->value(bcdiv($log->amount, 100, 2))->disable(); + + $this->radio('status')->options([ + 1 => '成功', + 2 => '拒绝', + ])->default(1); + $this->text('remarks')->rules('required_if:status,2', ['required_if'=>'拒绝时需要填写备注']); + } +} diff --git a/app/Admin/Repositories/WalletToBankLog.php b/app/Admin/Repositories/WalletToBankLog.php new file mode 100644 index 00000000..8fdb4f7e --- /dev/null +++ b/app/Admin/Repositories/WalletToBankLog.php @@ -0,0 +1,16 @@ +resource('wallet-to-bank-logs', 'WalletToBankLogController')->only([ + 'index', + ])->names('wallet_to_bank_logs'); + /** 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/WalletToBankLog.php b/app/Models/WalletToBankLog.php index d92fb753..26d7c76c 100644 --- a/app/Models/WalletToBankLog.php +++ b/app/Models/WalletToBankLog.php @@ -11,6 +11,10 @@ class WalletToBankLog extends Model use HasFactory; use HasDateTimeFormatter; + public const STATUS_PENDING = 0;//'待处理' + public const STATUS_AGREE = 1;//'已同意' + public const STATUS_REFUSE = 2;//'已拒绝' + /** * @var array */ @@ -21,5 +25,16 @@ class WalletToBankLog extends Model 'bank_description', 'username', 'amount', + 'status', + 'remarks', ]; + + /** + * 提现记录所属用户 + * + */ + public function user() + { + return $this->belongsTo(User::class); + } } diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index 726ee6ea..ca993647 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -217,6 +217,23 @@ class AdminMenuSeeder extends Seeder ], ], ], + [ + 'title' => '财务管理', + 'icon' => 'fa fa-jpy', + 'uri'=> '', + 'children'=>[ + [ + 'title' =>'提现审核', + 'icon' => '', + 'uri' =>'wallet-to-bank-logs', + ], + [ + 'title' => '售后打款', + 'icon' => '', + 'uri' =>'after-sales?state=5', + ], + ], + ], [ 'title' => '系统管理', 'icon' => 'feather icon-settings', diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index 8885dba4..1d86e676 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -229,6 +229,13 @@ class AdminPermissionSeeder extends Seeder 'name' =>'配置管理', 'curd' => ['index', 'create', 'store', 'edit', 'update', 'destroy'], ], + 'wallet_to_bank_logs' => [ + 'name' => '提现审核', + 'curd' => ['index'], + 'children' => [ + 'verify'=>['name' =>'审核'], + ], + ], ]; try { DB::begintransaction(); diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index d728e2c3..163ca002 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -80,6 +80,15 @@ namespace Dcat\Admin { * @property Grid\Column|Collection likes * @property Grid\Column|Collection media_type * @property Grid\Column|Collection media_content + * @property Grid\Column|Collection loggable_type + * @property Grid\Column|Collection loggable_id + * @property Grid\Column|Collection action + * @property Grid\Column|Collection before_balance + * @property Grid\Column|Collection change_balance + * @property Grid\Column|Collection balance + * @property Grid\Column|Collection total_expenses + * @property Grid\Column|Collection total_revenue + * @property Grid\Column|Collection transferable * @property Grid\Column|Collection continue_click_times * @property Grid\Column|Collection last_click_at * @property Grid\Column|Collection coupon_id @@ -94,6 +103,19 @@ namespace Dcat\Admin { * @property Grid\Column|Collection use_start_at * @property Grid\Column|Collection use_end_at * @property Grid\Column|Collection stock + * @property Grid\Column|Collection jobable_type + * @property Grid\Column|Collection jobable_id + * @property Grid\Column|Collection failed_reason + * @property Grid\Column|Collection pre_income_id + * @property Grid\Column|Collection pre_income_job_id + * @property Grid\Column|Collection change_amount + * @property Grid\Column|Collection change_sales_value + * @property Grid\Column|Collection change_revenue + * @property Grid\Column|Collection agent_level + * @property Grid\Column|Collection total_amount + * @property Grid\Column|Collection total_sales_value + * @property Grid\Column|Collection rule + * @property Grid\Column|Collection completed_at * @property Grid\Column|Collection uuid * @property Grid\Column|Collection connection * @property Grid\Column|Collection queue @@ -126,7 +148,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection coupon_discount_amount * @property Grid\Column|Collection vip_discount_amount * @property Grid\Column|Collection reduced_amount - * @property Grid\Column|Collection total_amount * @property Grid\Column|Collection after_sale_state * @property Grid\Column|Collection after_expire_at * @property Grid\Column|Collection remain_quantity @@ -134,7 +155,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection sales_value * @property Grid\Column|Collection max * @property Grid\Column|Collection reason - * @property Grid\Column|Collection failed_reason * @property Grid\Column|Collection user_coupon_id * @property Grid\Column|Collection shipping_fee * @property Grid\Column|Collection products_total_amount @@ -143,9 +163,11 @@ namespace Dcat\Admin { * @property Grid\Column|Collection pay_sn * @property Grid\Column|Collection pay_way * @property Grid\Column|Collection pay_at - * @property Grid\Column|Collection completed_at * @property Grid\Column|Collection shipping_state * @property Grid\Column|Collection is_change + * @property Grid\Column|Collection out_trade_no + * @property Grid\Column|Collection payable_type + * @property Grid\Column|Collection payable_id * @property Grid\Column|Collection tokenable_type * @property Grid\Column|Collection tokenable_id * @property Grid\Column|Collection token @@ -204,7 +226,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection bonusable * @property Grid\Column|Collection depth * @property Grid\Column|Collection path - * @property Grid\Column|Collection agent_level * @property Grid\Column|Collection quota_v2 * @property Grid\Column|Collection quota_v1 * @property Grid\Column|Collection group_sales_value @@ -216,15 +237,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection last_login_at * @property Grid\Column|Collection register_ip * @property Grid\Column|Collection status_remark - * @property Grid\Column|Collection wallet_id - * @property Grid\Column|Collection loggable_type - * @property Grid\Column|Collection loggable_id - * @property Grid\Column|Collection action - * @property Grid\Column|Collection before_balance - * @property Grid\Column|Collection fee - * @property Grid\Column|Collection balance - * @property Grid\Column|Collection total_expenses - * @property Grid\Column|Collection total_revenue * @property Grid\Column|Collection withdrawable * * @method Grid\Column|Collection id(string $label = null) @@ -296,6 +308,15 @@ namespace Dcat\Admin { * @method Grid\Column|Collection likes(string $label = null) * @method Grid\Column|Collection media_type(string $label = null) * @method Grid\Column|Collection media_content(string $label = null) + * @method Grid\Column|Collection loggable_type(string $label = null) + * @method Grid\Column|Collection loggable_id(string $label = null) + * @method Grid\Column|Collection action(string $label = null) + * @method Grid\Column|Collection before_balance(string $label = null) + * @method Grid\Column|Collection change_balance(string $label = null) + * @method Grid\Column|Collection balance(string $label = null) + * @method Grid\Column|Collection total_expenses(string $label = null) + * @method Grid\Column|Collection total_revenue(string $label = null) + * @method Grid\Column|Collection transferable(string $label = null) * @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) @@ -310,6 +331,19 @@ namespace Dcat\Admin { * @method Grid\Column|Collection use_start_at(string $label = null) * @method Grid\Column|Collection use_end_at(string $label = null) * @method Grid\Column|Collection stock(string $label = null) + * @method Grid\Column|Collection jobable_type(string $label = null) + * @method Grid\Column|Collection jobable_id(string $label = null) + * @method Grid\Column|Collection failed_reason(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 change_amount(string $label = null) + * @method Grid\Column|Collection change_sales_value(string $label = null) + * @method Grid\Column|Collection change_revenue(string $label = null) + * @method Grid\Column|Collection agent_level(string $label = null) + * @method Grid\Column|Collection total_amount(string $label = null) + * @method Grid\Column|Collection total_sales_value(string $label = null) + * @method Grid\Column|Collection rule(string $label = null) + * @method Grid\Column|Collection completed_at(string $label = null) * @method Grid\Column|Collection uuid(string $label = null) * @method Grid\Column|Collection connection(string $label = null) * @method Grid\Column|Collection queue(string $label = null) @@ -342,7 +376,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection coupon_discount_amount(string $label = null) * @method Grid\Column|Collection vip_discount_amount(string $label = null) * @method Grid\Column|Collection reduced_amount(string $label = null) - * @method Grid\Column|Collection total_amount(string $label = null) * @method Grid\Column|Collection after_sale_state(string $label = null) * @method Grid\Column|Collection after_expire_at(string $label = null) * @method Grid\Column|Collection remain_quantity(string $label = null) @@ -350,7 +383,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection sales_value(string $label = null) * @method Grid\Column|Collection max(string $label = null) * @method Grid\Column|Collection reason(string $label = null) - * @method Grid\Column|Collection failed_reason(string $label = null) * @method Grid\Column|Collection user_coupon_id(string $label = null) * @method Grid\Column|Collection shipping_fee(string $label = null) * @method Grid\Column|Collection products_total_amount(string $label = null) @@ -359,9 +391,11 @@ namespace Dcat\Admin { * @method Grid\Column|Collection pay_sn(string $label = null) * @method Grid\Column|Collection pay_way(string $label = null) * @method Grid\Column|Collection pay_at(string $label = null) - * @method Grid\Column|Collection completed_at(string $label = null) * @method Grid\Column|Collection shipping_state(string $label = null) * @method Grid\Column|Collection is_change(string $label = null) + * @method Grid\Column|Collection out_trade_no(string $label = null) + * @method Grid\Column|Collection payable_type(string $label = null) + * @method Grid\Column|Collection payable_id(string $label = null) * @method Grid\Column|Collection tokenable_type(string $label = null) * @method Grid\Column|Collection tokenable_id(string $label = null) * @method Grid\Column|Collection token(string $label = null) @@ -420,7 +454,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection bonusable(string $label = null) * @method Grid\Column|Collection depth(string $label = null) * @method Grid\Column|Collection path(string $label = null) - * @method Grid\Column|Collection agent_level(string $label = null) * @method Grid\Column|Collection quota_v2(string $label = null) * @method Grid\Column|Collection quota_v1(string $label = null) * @method Grid\Column|Collection group_sales_value(string $label = null) @@ -432,15 +465,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection last_login_at(string $label = null) * @method Grid\Column|Collection register_ip(string $label = null) * @method Grid\Column|Collection status_remark(string $label = null) - * @method Grid\Column|Collection wallet_id(string $label = null) - * @method Grid\Column|Collection loggable_type(string $label = null) - * @method Grid\Column|Collection loggable_id(string $label = null) - * @method Grid\Column|Collection action(string $label = null) - * @method Grid\Column|Collection before_balance(string $label = null) - * @method Grid\Column|Collection fee(string $label = null) - * @method Grid\Column|Collection balance(string $label = null) - * @method Grid\Column|Collection total_expenses(string $label = null) - * @method Grid\Column|Collection total_revenue(string $label = null) * @method Grid\Column|Collection withdrawable(string $label = null) */ class Grid {} @@ -517,6 +541,15 @@ namespace Dcat\Admin { * @property Show\Field|Collection likes * @property Show\Field|Collection media_type * @property Show\Field|Collection media_content + * @property Show\Field|Collection loggable_type + * @property Show\Field|Collection loggable_id + * @property Show\Field|Collection action + * @property Show\Field|Collection before_balance + * @property Show\Field|Collection change_balance + * @property Show\Field|Collection balance + * @property Show\Field|Collection total_expenses + * @property Show\Field|Collection total_revenue + * @property Show\Field|Collection transferable * @property Show\Field|Collection continue_click_times * @property Show\Field|Collection last_click_at * @property Show\Field|Collection coupon_id @@ -531,6 +564,19 @@ namespace Dcat\Admin { * @property Show\Field|Collection use_start_at * @property Show\Field|Collection use_end_at * @property Show\Field|Collection stock + * @property Show\Field|Collection jobable_type + * @property Show\Field|Collection jobable_id + * @property Show\Field|Collection failed_reason + * @property Show\Field|Collection pre_income_id + * @property Show\Field|Collection pre_income_job_id + * @property Show\Field|Collection change_amount + * @property Show\Field|Collection change_sales_value + * @property Show\Field|Collection change_revenue + * @property Show\Field|Collection agent_level + * @property Show\Field|Collection total_amount + * @property Show\Field|Collection total_sales_value + * @property Show\Field|Collection rule + * @property Show\Field|Collection completed_at * @property Show\Field|Collection uuid * @property Show\Field|Collection connection * @property Show\Field|Collection queue @@ -563,7 +609,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection coupon_discount_amount * @property Show\Field|Collection vip_discount_amount * @property Show\Field|Collection reduced_amount - * @property Show\Field|Collection total_amount * @property Show\Field|Collection after_sale_state * @property Show\Field|Collection after_expire_at * @property Show\Field|Collection remain_quantity @@ -571,7 +616,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection sales_value * @property Show\Field|Collection max * @property Show\Field|Collection reason - * @property Show\Field|Collection failed_reason * @property Show\Field|Collection user_coupon_id * @property Show\Field|Collection shipping_fee * @property Show\Field|Collection products_total_amount @@ -580,9 +624,11 @@ namespace Dcat\Admin { * @property Show\Field|Collection pay_sn * @property Show\Field|Collection pay_way * @property Show\Field|Collection pay_at - * @property Show\Field|Collection completed_at * @property Show\Field|Collection shipping_state * @property Show\Field|Collection is_change + * @property Show\Field|Collection out_trade_no + * @property Show\Field|Collection payable_type + * @property Show\Field|Collection payable_id * @property Show\Field|Collection tokenable_type * @property Show\Field|Collection tokenable_id * @property Show\Field|Collection token @@ -641,7 +687,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection bonusable * @property Show\Field|Collection depth * @property Show\Field|Collection path - * @property Show\Field|Collection agent_level * @property Show\Field|Collection quota_v2 * @property Show\Field|Collection quota_v1 * @property Show\Field|Collection group_sales_value @@ -653,15 +698,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection last_login_at * @property Show\Field|Collection register_ip * @property Show\Field|Collection status_remark - * @property Show\Field|Collection wallet_id - * @property Show\Field|Collection loggable_type - * @property Show\Field|Collection loggable_id - * @property Show\Field|Collection action - * @property Show\Field|Collection before_balance - * @property Show\Field|Collection fee - * @property Show\Field|Collection balance - * @property Show\Field|Collection total_expenses - * @property Show\Field|Collection total_revenue * @property Show\Field|Collection withdrawable * * @method Show\Field|Collection id(string $label = null) @@ -733,6 +769,15 @@ namespace Dcat\Admin { * @method Show\Field|Collection likes(string $label = null) * @method Show\Field|Collection media_type(string $label = null) * @method Show\Field|Collection media_content(string $label = null) + * @method Show\Field|Collection loggable_type(string $label = null) + * @method Show\Field|Collection loggable_id(string $label = null) + * @method Show\Field|Collection action(string $label = null) + * @method Show\Field|Collection before_balance(string $label = null) + * @method Show\Field|Collection change_balance(string $label = null) + * @method Show\Field|Collection balance(string $label = null) + * @method Show\Field|Collection total_expenses(string $label = null) + * @method Show\Field|Collection total_revenue(string $label = null) + * @method Show\Field|Collection transferable(string $label = null) * @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) @@ -747,6 +792,19 @@ namespace Dcat\Admin { * @method Show\Field|Collection use_start_at(string $label = null) * @method Show\Field|Collection use_end_at(string $label = null) * @method Show\Field|Collection stock(string $label = null) + * @method Show\Field|Collection jobable_type(string $label = null) + * @method Show\Field|Collection jobable_id(string $label = null) + * @method Show\Field|Collection failed_reason(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 change_amount(string $label = null) + * @method Show\Field|Collection change_sales_value(string $label = null) + * @method Show\Field|Collection change_revenue(string $label = null) + * @method Show\Field|Collection agent_level(string $label = null) + * @method Show\Field|Collection total_amount(string $label = null) + * @method Show\Field|Collection total_sales_value(string $label = null) + * @method Show\Field|Collection rule(string $label = null) + * @method Show\Field|Collection completed_at(string $label = null) * @method Show\Field|Collection uuid(string $label = null) * @method Show\Field|Collection connection(string $label = null) * @method Show\Field|Collection queue(string $label = null) @@ -779,7 +837,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection coupon_discount_amount(string $label = null) * @method Show\Field|Collection vip_discount_amount(string $label = null) * @method Show\Field|Collection reduced_amount(string $label = null) - * @method Show\Field|Collection total_amount(string $label = null) * @method Show\Field|Collection after_sale_state(string $label = null) * @method Show\Field|Collection after_expire_at(string $label = null) * @method Show\Field|Collection remain_quantity(string $label = null) @@ -787,7 +844,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection sales_value(string $label = null) * @method Show\Field|Collection max(string $label = null) * @method Show\Field|Collection reason(string $label = null) - * @method Show\Field|Collection failed_reason(string $label = null) * @method Show\Field|Collection user_coupon_id(string $label = null) * @method Show\Field|Collection shipping_fee(string $label = null) * @method Show\Field|Collection products_total_amount(string $label = null) @@ -796,9 +852,11 @@ namespace Dcat\Admin { * @method Show\Field|Collection pay_sn(string $label = null) * @method Show\Field|Collection pay_way(string $label = null) * @method Show\Field|Collection pay_at(string $label = null) - * @method Show\Field|Collection completed_at(string $label = null) * @method Show\Field|Collection shipping_state(string $label = null) * @method Show\Field|Collection is_change(string $label = null) + * @method Show\Field|Collection out_trade_no(string $label = null) + * @method Show\Field|Collection payable_type(string $label = null) + * @method Show\Field|Collection payable_id(string $label = null) * @method Show\Field|Collection tokenable_type(string $label = null) * @method Show\Field|Collection tokenable_id(string $label = null) * @method Show\Field|Collection token(string $label = null) @@ -857,7 +915,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection bonusable(string $label = null) * @method Show\Field|Collection depth(string $label = null) * @method Show\Field|Collection path(string $label = null) - * @method Show\Field|Collection agent_level(string $label = null) * @method Show\Field|Collection quota_v2(string $label = null) * @method Show\Field|Collection quota_v1(string $label = null) * @method Show\Field|Collection group_sales_value(string $label = null) @@ -869,15 +926,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection last_login_at(string $label = null) * @method Show\Field|Collection register_ip(string $label = null) * @method Show\Field|Collection status_remark(string $label = null) - * @method Show\Field|Collection wallet_id(string $label = null) - * @method Show\Field|Collection loggable_type(string $label = null) - * @method Show\Field|Collection loggable_id(string $label = null) - * @method Show\Field|Collection action(string $label = null) - * @method Show\Field|Collection before_balance(string $label = null) - * @method Show\Field|Collection fee(string $label = null) - * @method Show\Field|Collection balance(string $label = null) - * @method Show\Field|Collection total_expenses(string $label = null) - * @method Show\Field|Collection total_revenue(string $label = null) * @method Show\Field|Collection withdrawable(string $label = null) */ class Show {} diff --git a/resources/lang/zh_CN/product-spu.php b/resources/lang/zh_CN/product-spu.php index c1e33955..1a230327 100644 --- a/resources/lang/zh_CN/product-spu.php +++ b/resources/lang/zh_CN/product-spu.php @@ -32,6 +32,13 @@ return [ 'release_at'=>'上架时间', 'growth_value'=>'成长值', 'sales_value'=>'销售值', + 'gifts'=>'赠品', + 'gift_sku_id'=>'赠品名称', + 'num'=>'赠送数量', + 'limit'=>'限量', + 'category'=>[ + 'name'=>'商品分类', + ], ], 'options' => [ 'deny' => '删除失败', diff --git a/resources/lang/zh_CN/wallet-to-bank-log.php b/resources/lang/zh_CN/wallet-to-bank-log.php new file mode 100644 index 00000000..df230627 --- /dev/null +++ b/resources/lang/zh_CN/wallet-to-bank-log.php @@ -0,0 +1,23 @@ + [ + 'WalletToBankLog' => '提现审核', + 'wallet-to-bank-logs' => '提现审核', + ], + 'fields' => [ + 'bank_name' => '收款银行', + 'bank_number' => '收款银行卡号', + 'bank_description' => '收款银行开户行', + 'username' => '持卡人', + 'amount' => '提现金额', + 'status' => '状态', + 'remarks' => '备注', + 'created_at'=> '申请时间', + 'user'=>[ + 'phone' => '申请人', + ], + ], + 'options' => [ + ], +];