From e3f4d1db80d1f394822e4f9b66c48e8bfe665630 Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Mon, 10 Aug 2020 20:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=8F=E7=90=86=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/LanzuMmInfoController.php | 18 ++++-- .../Controllers/LanzuMmWithdrawController.php | 58 +++++++++++++++---- .../Controllers/LanzuMpWithdrawController.php | 2 +- app/Admin/routes.php | 3 +- app/Models/MpBalance.php | 4 +- 5 files changed, 63 insertions(+), 22 deletions(-) diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 44bc325..ef60602 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -9,6 +9,7 @@ use \App\Models\AdminRoleUsers; use App\Models\ImsCjdcMarket; use App\Models\LanzuMpInfo; use App\Models\LanzuMpInfo as mpInfo; +use App\Models\MpBalance; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Show; @@ -47,6 +48,9 @@ class LanzuMmInfoController extends AdminController $market = ImsCjdcMarket::find($id); return $market->name; }); + $grid->column('可提现金额')->display(function (){ + return MpBalance::getBalance($this->user_id,0); + }); $grid->id_frond->image('', 50, 50); $grid->id_back->image('', 50, 50); $grid->id_number; @@ -166,13 +170,15 @@ class LanzuMmInfoController extends AdminController { $user = Admin::user(); $mp = LanzuMpInfo::where('admin_user_id', $user->id)->first(); - $markets = ImsCjdcMarket::where('mp_id', $mp->id)->get(); $data = []; - foreach ($markets as $market) { - $item = []; - $item['id'] = $market->id; - $item['text'] = $market->name; - $data[] = $item; + if ($mp){ + $markets = ImsCjdcMarket::where('mp_id', $mp->id)->get(); + foreach ($markets as $market) { + $item = []; + $item['id'] = $market->id; + $item['text'] = $market->name; + $data[] = $item; + } } return response()->json($data); } diff --git a/app/Admin/Controllers/LanzuMmWithdrawController.php b/app/Admin/Controllers/LanzuMmWithdrawController.php index 9709b66..5cfe71b 100644 --- a/app/Admin/Controllers/LanzuMmWithdrawController.php +++ b/app/Admin/Controllers/LanzuMmWithdrawController.php @@ -35,15 +35,24 @@ class LanzuMmWithdrawController extends AdminController $ids = LanzuMmInfo::whereIn('market_id', $mk_ids)->pluck('id'); $buider = MmWithdraw::with('mmInfo')->whereIn('mm_id', $ids); } - return Grid::make($buider, function (Grid $grid) { + return Grid::make($buider, function (Grid $grid) use ($mp_info) { - $grid->actions(function (Grid\Displayers\Actions $actions)use ($grid){ - if($actions->row->status!=0){ + $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { + if ($actions->row->status != 0) { $actions->disableEdit(); } }); $grid->id->sortable(); - $grid->column('mmInfo.name', '经理名'); + if ($mp_info) { + $grid->column('mmInfo.name', '经理名'); + } else { + $grid->column('name', '经理名')->display(function () { + if ($this->mm_id) { + return LanzuMmInfo::find($this->mm_id)->name; + } + }); + } + $grid->money; $grid->status('提现状态')->using([-1 => '拒绝', 0 => '审核中', 1 => '通过']) ->label([-1 => 'danger', 0 => 'default', 1 => 'success']); @@ -83,23 +92,42 @@ class LanzuMmWithdrawController extends AdminController */ protected function form() { - return Form::make(new LanzuMmWithdraw(), function (Form $form) { + $mmId = $this->getMmId(Admin::user()->id); + return Form::make(new LanzuMmWithdraw(), function (Form $form) use ($mmId) { $form->display('id'); - $form->hidden('mm_id')->value($this->getMmId(Admin::user()->id)); + $form->hidden('mm_id')->value($mmId); $form->display('可提现金额')->value($this->getBalance(Admin::user()->id)); $form->display('提现人')->value(Admin::user()->name); - if ($form->isEditing()){//判断是否是编辑请求,如果是编辑请求,判断状态是否被编辑过. + if ($form->isEditing()) {//判断是否是编辑请求,如果是编辑请求,判断状态是否被编辑过. $form->display('money'); - if ($form->model()->status!=0){//如果提现状态已变更过,则不允许再编辑状态 + if ($form->model()->status != 0) {//如果提现状态已变更过,则不允许再编辑状态 $form->radio('status', '状态') ->options([0 => '待审核', 1 => '已同意', -1 => '已拒绝']) ->default(0)->disable(); - }else{ + } else { $form->radio('status', '状态') - ->options([0 => '待审核', 1 => '已同意', -1 => '已拒绝']) - ->default(0); + ->options([1 => '已同意', -1 => '已拒绝']); + } - }else{ + $form->saved(function (Form $form) use ($mmId) { + if ($form->status == -1) { + //如果提现申请被拒绝,返回提现金额 + $mm = LanzuMmInfo::find($mmId); + MpBalance::returnBalance($mm->user_id, 0, $form->model()->money); + } elseif ($form->status == 1) { + //调用微信企业付 + } + }); + } else { + //添加成功后扣减市场经理的可提现金额 + $form->saved(function (Form $form, $result) use ($mmId) { + if ($form->isCreating()) { + if ($result) { + $mm = LanzuMmInfo::find($mmId); + MpBalance::reduceBalance($mm->user_id, 0, $form->money); + } + } + }); $form->text('money')->required(); } }); @@ -147,4 +175,10 @@ class LanzuMmWithdrawController extends AdminController return 0; } } + + public function mmInfoList() + { + echo 11; + } + } diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index 53b687e..5584a72 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -113,7 +113,7 @@ class LanzuMpWithdrawController extends AdminController $form->disableSubmitButton(); $form->disableResetButton(); }else{ - $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1);; + $form->radio('status')->options([1 => '通过审核', -1=> '拒绝'])->default(-1); } $form->saved(function (Form $form,$result){ diff --git a/app/Admin/routes.php b/app/Admin/routes.php index 70e47af..82dbcf8 100644 --- a/app/Admin/routes.php +++ b/app/Admin/routes.php @@ -19,6 +19,7 @@ Route::group([ $router->resource('/market', 'ImsCjdcMarketController'); $router->resource('/mp_withdraw', 'LanzuMpWithdrawController'); $router->resource('/mm_withdraw', 'LanzuMmWithdrawController'); + $router->any('/mm_list', 'LanzuMmWithdrawController@mmInfoList'); $router->any('/api/getMarket', 'LanzuMmInfoController@getMarket'); $router->any('/api/getMpInfo', 'ImsCjdcMarketController@getMpInfo'); @@ -27,6 +28,6 @@ Route::group([ $router->get('/couponTie', 'CouponTieController@CouponTieList'); - + }); diff --git a/app/Models/MpBalance.php b/app/Models/MpBalance.php index 834c080..9154c33 100644 --- a/app/Models/MpBalance.php +++ b/app/Models/MpBalance.php @@ -43,11 +43,11 @@ class MpBalance extends Model /** * 回退审核未通过时的提现金额 */ - public static function returnBalance($uid,$uType,$reduceMoney) + public static function returnBalance($uid,$uType,$returnMoney) { $row = self::where(['user_id'=>$uid,'user_type'=>$uType])->first(); if ($row){ - $row->balance = $row->balance+$reduceMoney; + $row->balance = $row->balance+$returnMoney; return $row->save(); }else{ return false;