From ac15c3f1780b72f7d614381623531534dc259627 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 6 Aug 2020 18:50:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=82=E5=9C=BA=E7=BB=8F?= =?UTF-8?q?=E7=90=86=E8=A7=92=E8=89=B2=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8F=90?= =?UTF-8?q?=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'); } }