From fab2c619f52a5aee5fa1980eb0f7c32e927bf2d2 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 6 Aug 2020 15:13:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E5=BF=85=E5=A1=AB=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LanzuMpInfoController.php | 18 +++---- .../Controllers/LanzuMpWithdrawController.php | 48 +++++++++++++++---- app/Models/MpBalance.php | 13 +++++ 3 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 app/Models/MpBalance.php diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index 36173aa..b7ce3d7 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -101,15 +101,15 @@ class LanzuMpInfoController extends AdminController { return Form::make(new LanzuMpInfo(), function (Form $form) { $form->display('id')->hideInDialog(); - $form->text('name'); - $form->text('phone'); - $form->text('bank_name'); - $form->text('bank_card'); - $form->text('bank_addr'); - $form->image('id_frond')->uniqueName(); - $form->image('id_back')->uniqueName(); - $form->text('id_number'); - $form->radio('status','状态')->options(['禁用','启用']); + $form->text('name','姓名')->required(); + $form->mobile('phone')->required(); + $form->text('bank_name')->required(); + $form->text('bank_card')->required(); + $form->text('bank_addr')->required(); + $form->image('id_frond')->uniqueName()->required(); + $form->image('id_back')->uniqueName()->required(); + $form->text('id_number')->required(); + $form->radio('status','状态')->options(['禁用','启用'])->default(1); $form->saved(function (Form $form,$result){ $adu = new AdminUsers(); if ($form->isCreating()){ diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 6a980d8..d825193 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -6,8 +6,9 @@ use App\Admin\Repositories\LanzuMpWithdraw; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; +use Dcat\Admin\Admin; use Dcat\Admin\Controllers\AdminController; - +use App\Models\MpBalance; class LanzuMpWithdrawController extends AdminController { /** @@ -59,14 +60,45 @@ class LanzuMpWithdrawController extends AdminController public function mpForm(){ - return Form::make(new LanzuMpWithdraw(), function (Form $form) { - $form->display('id'); - $form->text('mp_id'); - $form->text('money'); - $form->text('status'); + $current_user = Admin::user(); - $form->display('created_at'); - $form->display('updated_at'); + + $mp = MpBalance::where('user_id',$current_user->id) + ->where('user_type',1)->first(); + + $balance = 0; + + if($mp){ + $balance = $mp->balance; + } + + + return Form::make(new LanzuMpWithdraw(), function (Form $form) use($current_user,$balance) { + + $form->footer(function ($footer) { + + // 去掉`查看`checkbox + $footer->disableViewCheck(); + + // 去掉`继续编辑`checkbox + $footer->disableEditingCheck(); + + // 去掉`继续创建`checkbox + $footer->disableCreatingCheck(); + }); + + + $form->tools(function (Form\Tools $tools) { + // 去掉跳转列表按钮 + $tools->disableList(); + }); + + $form->display('id'); + $form->hidden('mp_id')->value($current_user->id); + $form->text('balance','当前可提现余额')->value($balance)->disable()->help('当前可提现金额'); + $form->number('money','提现金额')->required(); + $form->ignore(['balance']); + //$form->text('status'); }); } protected function form() diff --git a/app/Models/MpBalance.php b/app/Models/MpBalance.php new file mode 100644 index 0000000..f40c833 --- /dev/null +++ b/app/Models/MpBalance.php @@ -0,0 +1,13 @@ + Date: Thu, 6 Aug 2020 15:18:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/LanzuMmWithdraw.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/LanzuMmWithdraw.php b/app/Models/LanzuMmWithdraw.php index 48a38b8..30d86c7 100644 --- a/app/Models/LanzuMmWithdraw.php +++ b/app/Models/LanzuMmWithdraw.php @@ -10,7 +10,7 @@ class LanzuMmWithdraw extends Model { use HasDateTimeFormatter; use SoftDeletes; - + protected $dateFormat = 'U'; protected $table = 'lanzu_mm_withdraw'; - + } From f0bd2db048ca8bb8d74731fef6e5f7b77531c510 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 6 Aug 2020 15:38:01 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=BB=8F=E7=90=86=E6=8F=90=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuMmWithdrawController.php | 9 ++++++--- app/Models/LanzuMmWithdraw.php | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index 8205272..beac81a 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -3,6 +3,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\LanzuMmWithdraw; +use App\Models\LanzuMmWithdraw as MmWithdraw; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -19,11 +20,13 @@ class LanzuMmWithdrawController extends AdminController */ protected function grid() { - return Grid::make(new LanzuMmWithdraw(), function (Grid $grid) { + return Grid::make(new LanzuMmWithdraw(['mmInfo']), function (Grid $grid) { $grid->id->sortable(); - $grid->mm_id('提现'); + //$grid->mm_id('提现'); + $grid->column('mmInfo.name','经理名'); $grid->money; - $grid->status('提现状态'); + $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过']) + ->label([-1=>'danger',0=>'default',1=>'success']); $grid->created_at('提现时间'); $grid->filter(function (Grid\Filter $filter) { diff --git a/app/Models/LanzuMmWithdraw.php b/app/Models/LanzuMmWithdraw.php index 30d86c7..85d7ead 100644 --- a/app/Models/LanzuMmWithdraw.php +++ b/app/Models/LanzuMmWithdraw.php @@ -13,4 +13,9 @@ class LanzuMmWithdraw extends Model protected $dateFormat = 'U'; protected $table = 'lanzu_mm_withdraw'; + public function mmInfo() + { + return $this->hasOne('\App\Models\LanzuMpInfo','id','mm_id'); + } + } From b2d1d204a1d49e19980d7c1424f96021019ca429 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 6 Aug 2020 17:05:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LanzuMpWithdrawController.php | 94 ++++++++++++++----- app/Models/LanzuMmWithdraw.php | 2 +- app/Models/LanzuMpWithdraw.php | 9 +- 3 files changed, 78 insertions(+), 27 deletions(-) diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index d825193..e0ebf19 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -18,18 +18,24 @@ class LanzuMpWithdrawController extends AdminController */ protected function grid() { - return Grid::make(new LanzuMpWithdraw(), function (Grid $grid) { + return Grid::make(new LanzuMpWithdraw(['mpInfo']), function (Grid $grid) { $grid->id->sortable(); - $grid->mp_id; + $grid->column('mpInfo.name','服务商名字'); $grid->money; - $grid->status; + $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过']) + ->label([-1=>'danger',0=>'default',1=>'success']); $grid->created_at; - $grid->updated_at->sortable(); - $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); }); + + $grid->actions(function (Grid\Displayers\Actions $actions) { + $actions->disableDelete(); + // $actions->disableEdit(); + $actions->disableQuickEdit(); + $actions->disableView(); + }); }); } @@ -42,9 +48,10 @@ class LanzuMpWithdrawController extends AdminController */ protected function detail($id) { - return Show::make($id, new LanzuMpWithdraw(), function (Show $show) { + return Show::make($id, new LanzuMpWithdraw(['mpInfo']), function (Show $show) { $show->id; $show->mp_id; + $show->column('服务商名称','mpInfo.name'); $show->money; $show->status; $show->created_at; @@ -58,21 +65,74 @@ class LanzuMpWithdrawController extends AdminController * @return Form */ - public function mpForm(){ + protected function lanzu_bis_form(){ + //管理员或者lanzu_bis操作 + return Form::make(new LanzuMpWithdraw(['mpInfo']), function (Form $form) { + + $form->footer(function ($footer) { + // 去掉`查看`checkbox + $footer->disableViewCheck(); + // 去掉`继续编辑`checkbox + $footer->disableEditingCheck(); + // 去掉`继续创建`checkbox + $footer->disableCreatingCheck(); + }); + + + $form->tools(function (Form\Tools $tools) { + // 去掉跳转详情页按钮 + $tools->disableView(); + // 去掉删除按钮 + $tools->disableDelete(); + $tools->disableList(); + }); + + // dd($form->model()->mp_info['name']); + $mpName = $form->model()->mp_info['name']; + //dd( $mpName); + $form->display('id'); + $form->text('mp_id','服务商ID')->disable(); + $form->display('','服务商名')->value($mpName); + $form->text('money','提现金额')->disable()->required(); + $form->hidden('is_operated'); + $form->saving(function (Form $form) { + $form->is_operated = 1; + }); + + if($form->model()->is_operated){ + $status = ''; + if($form->model()->status==1){ + $status = '审核通过'; + } + if($form->model()->status==-1){ + $status = '拒绝'; + } + $form->display('','审核状态')->value($status); + $form->disableSubmitButton(); + $form->disableResetButton(); + }else{ + $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1);; + } + + }); + } + + protected function form() + { $current_user = Admin::user(); + if(!$current_user->isRole('lanzu_mp')){ + return $this->lanzu_bis_form(); + } + //如果是服务商角色 $mp = MpBalance::where('user_id',$current_user->id) ->where('user_type',1)->first(); - $balance = 0; - if($mp){ $balance = $mp->balance; } - - return Form::make(new LanzuMpWithdraw(), function (Form $form) use($current_user,$balance) { $form->footer(function ($footer) { @@ -101,16 +161,4 @@ class LanzuMpWithdrawController extends AdminController //$form->text('status'); }); } - protected function form() - { - return Form::make(new LanzuMpWithdraw(), function (Form $form) { - $form->display('id'); - $form->text('mp_id'); - $form->text('money'); - $form->text('status'); - - $form->display('created_at'); - $form->display('updated_at'); - }); - } } diff --git a/app/Models/LanzuMmWithdraw.php b/app/Models/LanzuMmWithdraw.php index 85d7ead..a3b6322 100644 --- a/app/Models/LanzuMmWithdraw.php +++ b/app/Models/LanzuMmWithdraw.php @@ -15,7 +15,7 @@ class LanzuMmWithdraw extends Model public function mmInfo() { - return $this->hasOne('\App\Models\LanzuMpInfo','id','mm_id'); + return $this->hasOne('\App\Models\LanzuMmInfo','id','mm_id'); } } diff --git a/app/Models/LanzuMpWithdraw.php b/app/Models/LanzuMpWithdraw.php index 0227017..fa0cdb8 100755 --- a/app/Models/LanzuMpWithdraw.php +++ b/app/Models/LanzuMpWithdraw.php @@ -2,16 +2,19 @@ namespace App\Models; -use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\Model; class LanzuMpWithdraw extends Model { - use HasDateTimeFormatter; - use SoftDeletes; + use SoftDeletes; + protected $dateFormat = 'U'; protected $table = 'lanzu_mp_withdraw'; + public function mpInfo() + { + return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id'); + } } From ac15c3f1780b72f7d614381623531534dc259627 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 6 Aug 2020 18:50:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E8=A7=92=E8=89=B2=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/HomeController.php | 40 +++++++++++++++---- .../Controllers/LanzuMmInfoController.php | 24 +++++++++++ .../Controllers/LanzuMmWithdrawController.php | 22 +++++++++- .../Controllers/LanzuMpInfoController.php | 12 ++++++ app/Models/AdminRoleUsers.php | 13 ++++++ app/Models/AdminRoles.php | 13 ++++++ app/Models/LanzuMmInfo.php | 4 ++ app/Models/LanzuMmWithdraw.php | 2 +- 8 files changed, 119 insertions(+), 11 deletions(-) create mode 100644 app/Models/AdminRoleUsers.php create mode 100644 app/Models/AdminRoles.php diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index b3a22f0..8c416cb 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -18,6 +18,12 @@ class HomeController extends Controller if(Admin::user()->isRole('lanzu_business')){ return $this->lanzu_biz($content); } + if(Admin::user()->isRole('lanzu_mp')){ + return $this->lanzu_mp($content); + } + if(Admin::user()->isRole('lanzu_mm')){ + return $this->lanzu_mm($content); + } return $this->default($content); } @@ -44,24 +50,42 @@ class HomeController extends Controller } + protected function lanzu_mp(Content $content){ + return $content->header('控制面板') + ->description('欢迎回到懒族后台') + ->body(function (Row $row) { + $row->column(6, function (Column $column) { + }); + + $row->column(6, function (Column $column) { + + }); + }); + } + + protected function lanzu_mm(Content $content){ + return $content->header('控制面板') + ->description('欢迎回到懒族后台') + ->body(function (Row $row) { + $row->column(6, function (Column $column) { + }); + + $row->column(6, function (Column $column) { + + }); + }); + } + protected function lanzu_biz(Content $content) { return $content->header('控制面板') ->description('欢迎回到懒族后台') ->body(function (Row $row) { $row->column(6, function (Column $column) { - // $column->row(Dashboard::title()); - // $column->row(new Examples\Tickets()); }); $row->column(6, function (Column $column) { - // $column->row(function (Row $row) { - // $row->column(6, new Examples\NewUsers()); - // $row->column(6, new Examples\NewDevices()); - // }); - // $column->row(new Examples\Sessions()); - // $column->row(new Examples\ProductOrders()); }); }); } diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 8811438..198a9fe 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -12,6 +12,10 @@ use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use Illuminate\Support\Facades\Hash; use App\Models\LanzuMmInfo as mmInfo; +use Dcat\Admin\Admin; + + + class LanzuMmInfoController extends AdminController { /** @@ -21,7 +25,18 @@ class LanzuMmInfoController extends AdminController */ protected function grid() { + return Grid::make(new LanzuMmInfo(), function (Grid $grid) { + + $user = Admin::user(); + $mp_info = mpInfo::where('admin_user_id',$user->id)->first(); + $mk = ImsCjdcMarket::where('mp_id',$mp_info->id)->get()->pluck('id'); + $mk_ids = [-1]; + if(count($mk)>0){ + $mk_ids = $mk; + } + $grid->model()->whereIn('market_id',$mk_ids); + $grid->id->sortable(); $grid->name; $grid->phone; @@ -119,6 +134,15 @@ class LanzuMmInfoController extends AdminController //>>3.将帐号id关联到市场经理 $mm->admin_user_id = $adu->id; $mm->save(); + + //添加到admin roles中 + //添加服务商角色 + $lanzu_mm = AdminRoles::where('slug','lanzu_mm')->first(); + $aru = new AdminRoleUsers; + $aru->role_id = $lanzu_mm->id; + $aru->user_id = $adu->id; + $aru->save(); + }else{ //>>4.编辑时同步登陆帐号状态 $id = $form->getKey(); diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index beac81a..c226941 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -4,11 +4,15 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\LanzuMmWithdraw; use App\Models\LanzuMmWithdraw as MmWithdraw; +use App\Models\LanzuMmInfo; + +use App\Models\ImsCjdcMarket; +use App\Models\LanzuMpInfo as mpInfo; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; -use Encore\Admin\Facades\Admin; +use Dcat\Admin\Admin; use Illuminate\Support\Facades\Auth; class LanzuMmWithdrawController extends AdminController @@ -20,7 +24,21 @@ class LanzuMmWithdrawController extends AdminController */ protected function grid() { - return Grid::make(new LanzuMmWithdraw(['mmInfo']), function (Grid $grid) { + + $user = Admin::user(); + $mp_info = mpInfo::where('admin_user_id',$user->id)->first(); + $mk = ImsCjdcMarket::where('mp_id',$mp_info->id)->get()->pluck('id'); + $mk_ids = [-1]; + if(count($mk)>0){ + $mk_ids = $mk; + } + + $ids = LanzuMmInfo::whereIn('market_id',$mk_ids)->pluck('id'); + + $buider = MmWithdraw::with('mmInfo')->whereIn('mm_id',$ids); + + return Grid::make($buider, function (Grid $grid) { + //$grid->model()->mmInfo()->where('market_id',1); $grid->id->sortable(); //$grid->mm_id('提现'); $grid->column('mmInfo.name','经理名'); diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index b7ce3d7..9c10289 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -14,6 +14,9 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; use \App\Models\LanzuMpInfo as mpInfo; use \App\Models\AdminUsers; +use \App\Models\AdminRoles; +use \App\Models\AdminRoleUsers; + class LanzuMpInfoController extends AdminController { @@ -138,6 +141,15 @@ class LanzuMpInfoController extends AdminController //>>3.将帐号id关联到服务商 $mp->admin_user_id = $adu->id; $mp->save(); + + //添加服务商角色 + $lanzu_mp = AdminRoles::where('slug','lanzu_mp')->first(); + $aru = new AdminRoleUsers; + $aru->role_id = $lanzu_mp->id; + $aru->user_id = $adu->id; + $aru->save(); + + }else{ //>>4.编辑时同步登陆帐号状态 $id = $form->getKey(); diff --git a/app/Models/AdminRoleUsers.php b/app/Models/AdminRoleUsers.php new file mode 100644 index 0000000..af6d804 --- /dev/null +++ b/app/Models/AdminRoleUsers.php @@ -0,0 +1,13 @@ +hasOne('\App\Models\LanzuMmWithdraw','mm_id','id'); + } } diff --git a/app/Models/LanzuMmWithdraw.php b/app/Models/LanzuMmWithdraw.php index a3b6322..402f219 100644 --- a/app/Models/LanzuMmWithdraw.php +++ b/app/Models/LanzuMmWithdraw.php @@ -15,7 +15,7 @@ class LanzuMmWithdraw extends Model public function mmInfo() { - return $this->hasOne('\App\Models\LanzuMmInfo','id','mm_id'); + return $this->belongsTo('\App\Models\LanzuMmInfo','mm_id','id'); } }