Merge branch 'develop' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into develop

# Conflicts:
#	app/Admin/Controllers/LanzuMmWithdrawController.php
#	app/Admin/Controllers/LanzuMpInfoController.php
#	app/Models/LanzuMmWithdraw.php

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());
            });
        });
     }

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();

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -3,11 +3,16 @@
 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
@@ -19,24 +24,28 @@ class LanzuMmWithdrawController extends AdminController
      */
     protected function grid()
     {
-        return Grid::make(new LanzuMmWithdraw(), 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->column('mm_id','提现人')->display(function (){
-                return Auth::guard('admin')->user()->toArray()['name'];
-            });
+            //$grid->mm_id('提现');
+            $grid->column('mmInfo.name','经理名');
             $grid->money;
-            $grid->status('提现状态')->display(function ($status){
-                if ($status==0){
-                    return '待审核';
-                }elseif ($status==1){
-                    return  '已同意';
-                }else{
-                    return '已拒绝';
-                }
-            });
-            $grid->created_at('提现时间')->display(function ($time){
-                return date('Y-m-d H:i',$time);
-            });
+            $grid->status('提现状态')->using([-1=>'拒绝',0=>'审核中',1=>'通过'])
+            ->label([-1=>'danger',0=>'default',1=>'success']);
+            $grid->created_at('提现时间');
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
@@ -72,9 +81,8 @@ class LanzuMmWithdrawController extends AdminController
     protected function form()
     {
         return Form::make(new LanzuMmWithdraw(), function (Form $form) {
-            $form->display('name','提现用户')->value(Auth::guard('admin')->user()->toArray()['name']);
             $form->display('id');
-            $form->hidden('mm_id')->value(Auth::guard('admin')->user()->getAuthIdentifier());
+            $form->text('mm_id');
             $form->text('money');
             $form->display('created_at');
             $form->display('updated_at');

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
 {
@@ -101,14 +104,14 @@ class LanzuMpInfoController extends AdminController
     {
         return Form::make(new LanzuMpInfo(), function (Form $form) {
             $form->display('id')->hideInDialog();
-            $form->text('name')->required();
-            $form->text('phone')->required();
+            $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();
-            $form->image('id_back')->uniqueName();
-            $form->text('id_number');
+            $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();
@@ -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();

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
 {
     /**
@@ -17,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();
+            });
         });
     }
 
@@ -41,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;
@@ -57,28 +65,100 @@ class LanzuMpWithdrawController extends AdminController
      * @return Form
      */
 
-    public function mpForm(){
 
-        return Form::make(new LanzuMpWithdraw(), function (Form $form) {
+    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');
-            $form->text('money');
-            $form->text('status');
+            $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);;
+            }
 
-            $form->display('created_at');
-            $form->display('updated_at');
         });
     }
+
     protected function form()
     {
-        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();
+
+        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) {
+
+                // 去掉`查看`checkbox
+                $footer->disableViewCheck();
+
+                // 去掉`继续编辑`checkbox
+                $footer->disableEditingCheck();
 
-            $form->display('created_at');
-            $form->display('updated_at');
+                // 去掉`继续创建`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');
         });
     }
 }

app/Models/AdminRoleUsers.php

@@ -0,0 +1,13 @@
+<?php
+
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+
+
+class AdminRoleUsers extends Model
+{
+    protected $table = 'admin_role_users';
+    //protected $dateFormat = 'U';
+
+}

app/Models/AdminRoles.php

@@ -0,0 +1,13 @@
+<?php
+
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\Model;
+
+
+class AdminRoles extends Model
+{
+    protected $table = 'admin_roles';
+    //protected $dateFormat = 'U';
+
+}

app/Models/LanzuMmInfo.php

@@ -12,4 +12,8 @@ class LanzuMmInfo extends Model
     protected $table = 'lanzu_mm_info';
     protected $dateFormat = 'U';
 
+    public function Withdraw()
+    {
+        return $this->hasOne('\App\Models\LanzuMmWithdraw','mm_id','id');
+    }
 }

app/Models/LanzuMmWithdraw.php

@@ -10,8 +10,12 @@ class LanzuMmWithdraw extends Model
 {
 	use HasDateTimeFormatter;
     use SoftDeletes;
-
-    protected $table = 'lanzu_mm_withdraw';
     protected $dateFormat = 'U';
+    protected $table = 'lanzu_mm_withdraw';
+
+    public function mmInfo()
+    {
+       return $this->belongsTo('\App\Models\LanzuMmInfo','mm_id','id');
+    }
 
 }

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');
+    }
 
 }

app/Models/MpBalance.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class MpBalance extends Model
+{
+    protected $table = 'lanzu_mp_balance';
+    protected $dateFormat = 'U';
+}