From 30a477031489e7c8418397034720e884cfa3dedc Mon Sep 17 00:00:00 2001 From: liapples Date: Sun, 7 Nov 2021 15:51:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/StatementController.php | 69 ++++------------- .../Controllers/WalletController.php | 42 +++++----- .../Controllers/StatementController.php | 77 +++++-------------- .../Controllers/WalletController.php | 41 +++++----- .../Controllers/DepositLogController.php | 22 +++--- .../Controllers/StatementController.php | 77 +++++-------------- .../Controllers/WalletController.php | 41 +++++----- resources/lang/zh_CN/deposit-log.php | 4 +- resources/lang/zh_CN/statement.php | 13 ++-- 9 files changed, 135 insertions(+), 251 deletions(-) diff --git a/app/AdminAgent/Controllers/StatementController.php b/app/AdminAgent/Controllers/StatementController.php index 6fab3f2..e851df6 100644 --- a/app/AdminAgent/Controllers/StatementController.php +++ b/app/AdminAgent/Controllers/StatementController.php @@ -5,10 +5,9 @@ namespace App\AdminAgent\Controllers; use App\AdminAgent\Repositories\Statement; use App\Common\StatementType; use App\Traits\DemandTraits; +use App\Traits\StatementTraits; use Dcat\Admin\Admin; -use Dcat\Admin\Form; use Dcat\Admin\Grid; -use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; class StatementController extends AdminController @@ -21,65 +20,25 @@ class StatementController extends AdminController protected function grid() { return Grid::make(new Statement(), function (Grid $grid) { - $grid->model()->where([ - 'access_id'=> Admin::user()->id, - 'access_type' => DemandTraits::$col[0] - ]); + $grid->disableCreateButton(); + $grid->disableActions(); + $grid->disableRowSelector(); + + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id'=> Admin::user()->id, + 'user_type' => DemandTraits::$col[0] + ]); + $grid->column('id')->sortable(); $grid->column('price'); $grid->column('type')->using(StatementType::array()); + $grid->column('access_id'); $grid->column('created_at'); - $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableActions(); - $grid->disableRowSelector(); + $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); - + $filter->equal('id')->width(2); + $filter->equal('access_type')->select(StatementTraits::$TypeText)->width(2); }); }); } - - /** - * Make a show builder. - * - * @param mixed $id - * - * @return Show - */ - protected function detail($id) - { - return Show::make($id, new Statement(), function (Show $show) { - $show->field('id'); - $show->field('price'); - $show->field('type'); - $show->field('user_id'); - $show->field('user_type'); - $show->field('access_id'); - $show->field('access_type'); - $show->field('created_at'); - $show->field('updated_at'); - }); - } - - /** - * Make a form builder. - * - * @return Form - */ - protected function form() - { - return Form::make(new Statement(), function (Form $form) { - $form->display('id'); - $form->text('price'); - $form->text('type'); - $form->text('user_id'); - $form->text('user_type'); - $form->text('access_id'); - $form->text('access_type'); - - $form->display('created_at'); - $form->display('updated_at'); - }); - } } diff --git a/app/AdminAgent/Controllers/WalletController.php b/app/AdminAgent/Controllers/WalletController.php index 1c45b54..8ae7694 100644 --- a/app/AdminAgent/Controllers/WalletController.php +++ b/app/AdminAgent/Controllers/WalletController.php @@ -13,6 +13,7 @@ use Dcat\Admin\Layout\Content; use Dcat\Admin\Layout\Row; use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Widgets\Card; +use Dcat\Admin\Widgets\Tab; class WalletController extends AdminController { @@ -72,31 +73,34 @@ HTML; }) ->body( Grid::make(new Withdrawal(), function (Grid $grid) { - $grid->model()->where(['user_id' => Admin::user()->id,'user_type' => DemandTraits::$col[0]]); $grid->disableActions(); - //$grid->disable(); - $grid->column('id')->sortable(); - $grid->column('price','提现金额'); - $grid->column('pay_type','提现方式')->using(WithdrawalTraits::$userTypeText); - //$grid->column('pay_id'); - $grid->column('status','状态')->using(WithdrawalTraits::$stateText)->dot([ - - 1 => Admin::color()->yellow(), - 2 => 'danger', - 3 => 'success', - 4 => Admin::color()->info(), + $grid->disableCreateButton(); + $grid->disableRowSelector(); + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id' => Admin::user()->id, + 'user_type' => DemandTraits::$col[0] ]); - $grid->column('created_at'); + + $grid->column('id')->sortable(); + $grid->column('price', '提现金额'); + $grid->column('pay_type', '提现方式')->using(WithdrawalTraits::$userTypeText); + $grid->column('status', '状态') + ->using(WithdrawalTraits::$stateText) + ->dot([ + 1 => Admin::color()->yellow(), + 2 => 'danger', + 3 => 'success', + 4 => Admin::color()->info(), + ]); + $grid->column('created_at', '提现时间'); $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableRowSelector(); + $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id')->width(3); - $filter->equal('status','状态')->select(WithdrawalTraits::$stateTextSelect)->width(2); + $filter->equal('id')->width(2); + $filter->equal('status', '状态')->select(WithdrawalTraits::$stateText)->width(2); }); - }) - + })->title('提现记录') ); } diff --git a/app/AdminGuide/Controllers/StatementController.php b/app/AdminGuide/Controllers/StatementController.php index 43fd621..14f1f26 100644 --- a/app/AdminGuide/Controllers/StatementController.php +++ b/app/AdminGuide/Controllers/StatementController.php @@ -5,10 +5,9 @@ namespace App\AdminGuide\Controllers; use App\AdminGuide\Repositories\Statement; use App\Common\StatementType; use App\Traits\DemandTraits; +use App\Traits\StatementTraits; use Dcat\Admin\Admin; -use Dcat\Admin\Form; use Dcat\Admin\Grid; -use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; class StatementController extends AdminController @@ -21,65 +20,25 @@ class StatementController extends AdminController protected function grid() { return Grid::make(new Statement(), function (Grid $grid) { - $grid->model()->where([ - 'access_id'=> Admin::user()->id, - 'access_type' => DemandTraits::$col[2] - ]); - $grid->column('id')->sortable(); - $grid->column('price'); - $grid->column('type')->using(StatementType::array()); - $grid->column('created_at'); - $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableActions(); - $grid->disableRowSelector(); - $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); - - }); - }); - } + $grid->disableCreateButton(); + $grid->disableActions(); + $grid->disableRowSelector(); - /** - * Make a show builder. - * - * @param mixed $id - * - * @return Show - */ - protected function detail($id) - { - return Show::make($id, new Statement(), function (Show $show) { - $show->field('id'); - $show->field('price'); - $show->field('type'); - $show->field('user_id'); - $show->field('user_type'); - $show->field('access_id'); - $show->field('access_type'); - $show->field('created_at'); - $show->field('updated_at'); - }); - } + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id'=> Admin::user()->id, + 'user_type' => DemandTraits::$col[2] + ]); - /** - * Make a form builder. - * - * @return Form - */ - protected function form() - { - return Form::make(new Statement(), function (Form $form) { - $form->display('id'); - $form->text('price'); - $form->text('type'); - $form->text('user_id'); - $form->text('user_type'); - $form->text('access_id'); - $form->text('access_type'); - - $form->display('created_at'); - $form->display('updated_at'); + $grid->column('id')->sortable(); + $grid->column('price'); + $grid->column('type')->using(StatementType::array()); + $grid->column('access_id'); + $grid->column('created_at'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id')->width(2); + $filter->equal('access_type')->select(StatementTraits::$TypeText)->width(2); + }); }); } } diff --git a/app/AdminGuide/Controllers/WalletController.php b/app/AdminGuide/Controllers/WalletController.php index 9ef36c4..d375d21 100644 --- a/app/AdminGuide/Controllers/WalletController.php +++ b/app/AdminGuide/Controllers/WalletController.php @@ -72,31 +72,34 @@ HTML; }) ->body( Grid::make(new Withdrawal(), function (Grid $grid) { - $grid->model()->where(['user_id' => Admin::user()->id,'user_type' => DemandTraits::$col[2]]); $grid->disableActions(); - //$grid->disable(); - $grid->column('id')->sortable(); - $grid->column('price','提现金额'); - $grid->column('pay_type','提现方式')->using(WithdrawalTraits::$userTypeText); - //$grid->column('pay_id'); - $grid->column('status','状态')->using(WithdrawalTraits::$stateText)->dot([ - - 1 => Admin::color()->yellow(), - 2 => 'danger', - 3 => 'success', - 4 => Admin::color()->info(), + $grid->disableCreateButton(); + $grid->disableRowSelector(); + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id' => Admin::user()->id, + 'user_type' => DemandTraits::$col[2] ]); - $grid->column('created_at'); + + $grid->column('id')->sortable(); + $grid->column('price', '提现金额'); + $grid->column('pay_type', '提现方式')->using(WithdrawalTraits::$userTypeText); + $grid->column('status', '状态') + ->using(WithdrawalTraits::$stateText) + ->dot([ + 1 => Admin::color()->yellow(), + 2 => 'danger', + 3 => 'success', + 4 => Admin::color()->info(), + ]); + $grid->column('created_at', '提现时间'); $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableRowSelector(); + $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id')->width(3); - $filter->equal('status','状态')->select(WithdrawalTraits::$stateTextSelect)->width(2); + $filter->equal('id')->width(2); + $filter->equal('status', '状态')->select(WithdrawalTraits::$stateText)->width(2); }); - }) - + })->title('提现记录') ); } diff --git a/app/AdminSupplier/Controllers/DepositLogController.php b/app/AdminSupplier/Controllers/DepositLogController.php index b374356..63d41ba 100755 --- a/app/AdminSupplier/Controllers/DepositLogController.php +++ b/app/AdminSupplier/Controllers/DepositLogController.php @@ -3,7 +3,6 @@ namespace App\AdminSupplier\Controllers; use App\AdminSupplier\Repositories\DepositLog; -use App\Traits\StatementTraits; use Dcat\Admin\Admin; use Dcat\Admin\Grid; use Dcat\Admin\Layout\Column; @@ -56,25 +55,22 @@ HTML; }) ->body( - Grid::make(new DepositLog('supplier'), function (Grid $grid) { - $grid->model()->where('supplier_id', Admin::user()->id); - $grid->column('id')->sortable(); - $grid->column('price'); - $grid->column('supplier.company_name', '供应商'); - $grid->column('type', '类型')->using(StatementTraits::$depositText); - $grid->column('created_at'); - $grid->column('updated_at')->sortable(); - + Grid::make(new DepositLog(), function (Grid $grid) { $grid->disableDeleteButton(); $grid->disableRowSelector(); $grid->disableCreateButton(); $grid->disableActions(); - $grid->filter(function (Grid\Filter $filter) { - $filter->equal('type', '状态')->width(2)->select(StatementTraits::$depositText); + $grid->model()->orderBy('id', 'desc')->where('supplier_id', Admin::user()->id); + + $grid->column('id')->sortable(); + $grid->column('price'); + $grid->column('created_at', '时间'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id')->width(2); }); }) - ); } } diff --git a/app/AdminSupplier/Controllers/StatementController.php b/app/AdminSupplier/Controllers/StatementController.php index 7a378f0..345b729 100644 --- a/app/AdminSupplier/Controllers/StatementController.php +++ b/app/AdminSupplier/Controllers/StatementController.php @@ -5,10 +5,9 @@ namespace App\AdminSupplier\Controllers; use App\AdminSupplier\Repositories\Statement; use App\Common\StatementType; use App\Traits\DemandTraits; +use App\Traits\StatementTraits; use Dcat\Admin\Admin; -use Dcat\Admin\Form; use Dcat\Admin\Grid; -use Dcat\Admin\Show; use Dcat\Admin\Http\Controllers\AdminController; class StatementController extends AdminController @@ -21,65 +20,25 @@ class StatementController extends AdminController protected function grid() { return Grid::make(new Statement(), function (Grid $grid) { - $grid->model()->where([ - 'access_id'=> Admin::user()->id, - 'access_type' => DemandTraits::$col[1] - ]); - $grid->column('id')->sortable(); - $grid->column('price'); - $grid->column('type')->using(StatementType::array()); - $grid->column('created_at'); - $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableActions(); - $grid->disableRowSelector(); - $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); - - }); - }); - } + $grid->disableCreateButton(); + $grid->disableActions(); + $grid->disableRowSelector(); - /** - * Make a show builder. - * - * @param mixed $id - * - * @return Show - */ - protected function detail($id) - { - return Show::make($id, new Statement(), function (Show $show) { - $show->field('id'); - $show->field('price'); - $show->field('type'); - $show->field('user_id'); - $show->field('user_type'); - $show->field('access_id'); - $show->field('access_type'); - $show->field('created_at'); - $show->field('updated_at'); - }); - } + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id'=> Admin::user()->id, + 'user_type' => DemandTraits::$col[1] + ]); - /** - * Make a form builder. - * - * @return Form - */ - protected function form() - { - return Form::make(new Statement(), function (Form $form) { - $form->display('id'); - $form->text('price'); - $form->text('type'); - $form->text('user_id'); - $form->text('user_type'); - $form->text('access_id'); - $form->text('access_type'); - - $form->display('created_at'); - $form->display('updated_at'); + $grid->column('id')->sortable(); + $grid->column('price'); + $grid->column('type')->using(StatementType::array()); + $grid->column('access_id'); + $grid->column('created_at'); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id')->width(2); + $filter->equal('access_type')->select(StatementTraits::$TypeText)->width(2); + }); }); } } diff --git a/app/AdminSupplier/Controllers/WalletController.php b/app/AdminSupplier/Controllers/WalletController.php index e3a2f20..506d3fe 100644 --- a/app/AdminSupplier/Controllers/WalletController.php +++ b/app/AdminSupplier/Controllers/WalletController.php @@ -72,31 +72,34 @@ HTML; }) ->body( Grid::make(new Withdrawal(), function (Grid $grid) { - $grid->model()->where(['user_id' => Admin::user()->id,'user_type' => DemandTraits::$col[1]]); $grid->disableActions(); - //$grid->disable(); - $grid->column('id')->sortable(); - $grid->column('price','提现金额'); - $grid->column('pay_type','提现方式')->using(WithdrawalTraits::$userTypeText); - //$grid->column('pay_id'); - $grid->column('status','状态')->using(WithdrawalTraits::$stateText)->dot([ - - 1 => Admin::color()->yellow(), - 2 => 'danger', - 3 => 'success', - 4 => Admin::color()->info(), + $grid->disableCreateButton(); + $grid->disableRowSelector(); + $grid->model()->orderBy('id', 'desc')->where([ + 'user_id' => Admin::user()->id, + 'user_type' => DemandTraits::$col[1] ]); - $grid->column('created_at'); + + $grid->column('id')->sortable(); + $grid->column('price', '提现金额'); + $grid->column('pay_type', '提现方式')->using(WithdrawalTraits::$userTypeText); + $grid->column('status', '状态') + ->using(WithdrawalTraits::$stateText) + ->dot([ + 1 => Admin::color()->yellow(), + 2 => 'danger', + 3 => 'success', + 4 => Admin::color()->info(), + ]); + $grid->column('created_at', '提现时间'); $grid->column('updated_at')->sortable(); - $grid->disableCreateButton(); - $grid->disableRowSelector(); + $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id')->width(3); - $filter->equal('status','状态')->select(WithdrawalTraits::$stateTextSelect)->width(2); + $filter->equal('id')->width(2); + $filter->equal('status', '状态')->select(WithdrawalTraits::$stateText)->width(2); }); - }) - + })->title('提现记录') ); } diff --git a/resources/lang/zh_CN/deposit-log.php b/resources/lang/zh_CN/deposit-log.php index 4e7493b..174e97e 100755 --- a/resources/lang/zh_CN/deposit-log.php +++ b/resources/lang/zh_CN/deposit-log.php @@ -5,9 +5,9 @@ return [ 'deposit-log' => '交易金流水', ], 'fields' => [ - 'price' => '变更价格', + 'price' => '变更金额', 'supplier_id' => '供应商id', - 'type' => '类型 1正常 2 冻结 3消费', + 'type' => '变动类型', ], 'options' => [ ], diff --git a/resources/lang/zh_CN/statement.php b/resources/lang/zh_CN/statement.php index 6649114..ea8b2e6 100644 --- a/resources/lang/zh_CN/statement.php +++ b/resources/lang/zh_CN/statement.php @@ -1,16 +1,17 @@ - [ 'Statement' => '余额流水', 'statement' => '余额流水', ], 'fields' => [ - 'price' => '金额', - 'type' => '类型', - 'user_id' => '代理商id', + 'price' => '变动金额', + 'type' => '变动类型', + 'user_id' => '商户id', 'user_type' => '用户类型', - 'access_id' => '关联', - 'access_type' => '关联类型 目前有订单 和提现', + 'access_id' => '关联ID', + 'access_type' => '流水类型', + 'created_at' => '时间', ], 'options' => [ ],