From 6eb22b195a7ff819b1903359c8b3c4becd02dc81 Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Tue, 25 Aug 2020 17:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A4=BE=E5=8C=BA=E7=AB=99?= =?UTF-8?q?=E7=82=B9=E6=B5=8B=E8=AF=95bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/LanzuCsInfoController.php | 11 ++++++++++- app/Admin/Controllers/LanzuCsWithdrawController.php | 5 ++++- app/Admin/Controllers/LanzuFinancialRecord.php | 2 +- .../Controllers/LanzuServiceRewardController.php | 2 ++ app/Models/LanzuUserBalance.php | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php index 260580e..a89c4a1 100644 --- a/app/Admin/Controllers/LanzuCsInfoController.php +++ b/app/Admin/Controllers/LanzuCsInfoController.php @@ -9,6 +9,7 @@ use App\Admin\Repositories\LanzuCsInfo; use App\Models\AdminUsers; use App\Models\FinancialRecord; use App\Models\ImsCjdcMarket; +use App\Models\ImsCjdcUser; use App\Models\LanzuUserBalance; use Dcat\Admin\Admin; use Dcat\Admin\Form; @@ -16,6 +17,7 @@ use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use \App\Models\LanzuCsInfo as modelCsInfo; +use function foo\func; class LanzuCsInfoController extends AdminController { @@ -90,7 +92,14 @@ class LanzuCsInfoController extends AdminController $form->select('market_id', '所属市场')->options(ImsCjdcMarket::getMarket())->required(); $form->text('address', '社区地址')->required(); $form->radio('status', '状态')->options(['禁用', '启用'])->default(1); - //$form->datetime('start_time')->value('1598239137'); + $form->saving(function (Form $form){ + //检验用户user_id 是否存在 + $count = ImsCjdcUser::where('id',$form->user_id)->count(); + if (!$count){ + return $form->error('用户ID不存在'); + } + }); + $form->saved(function (Form $form, $cid) { $model = new modelCsInfo(); if ($form->isCreating()) { diff --git a/app/Admin/Controllers/LanzuCsWithdrawController.php b/app/Admin/Controllers/LanzuCsWithdrawController.php index 20e5aff..823ea3b 100644 --- a/app/Admin/Controllers/LanzuCsWithdrawController.php +++ b/app/Admin/Controllers/LanzuCsWithdrawController.php @@ -25,6 +25,7 @@ class LanzuCsWithdrawController extends AdminController */ protected function grid() { + return Grid::make(new LanzuCsWithdraw('csInfo'), function (Grid $grid) { $user = Admin::user(); if (!$user->isRole('lanzu_cs')) {//如果不是社区站点的角色登陆,则隐藏提现入口 @@ -35,6 +36,8 @@ class LanzuCsWithdrawController extends AdminController } }); } else { + $cid = LanzuCsInfo::where('admin_user_id',$user->id)->pluck('id')->first(); + $grid->model()->where('cs_id',$cid); $grid->disableEditButton(); } $grid->disableViewButton(); @@ -87,7 +90,7 @@ class LanzuCsWithdrawController extends AdminController if ($user->isRole('lanzu_cs')) {//如果是社区站点角色 $cs = LanzuCsInfo::where('admin_user_id', $user->id)->first(); if ($cs) { - $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($cs->id, 3))->disable(); + $form->text('amount', '可提现金额')->value(LanzuUserBalance::getBalance($user->id, 3))->disable(); $form->hidden('cs_id', '提现用户id')->value($cs->id); $form->text('csInfo.name', '提现用户')->value($cs->name)->disable(); $form->number('money')->min(0)->max(env('MAX_MONEY')); diff --git a/app/Admin/Controllers/LanzuFinancialRecord.php b/app/Admin/Controllers/LanzuFinancialRecord.php index 0067fff..ba340ed 100644 --- a/app/Admin/Controllers/LanzuFinancialRecord.php +++ b/app/Admin/Controllers/LanzuFinancialRecord.php @@ -58,7 +58,7 @@ class LanzuFinancialRecord extends AdminController $grid->disableEditButton(); $grid->disableDeleteButton(); - + }); } diff --git a/app/Admin/Controllers/LanzuServiceRewardController.php b/app/Admin/Controllers/LanzuServiceRewardController.php index f0908ed..76813c2 100644 --- a/app/Admin/Controllers/LanzuServiceRewardController.php +++ b/app/Admin/Controllers/LanzuServiceRewardController.php @@ -33,6 +33,8 @@ class LanzuServiceRewardController extends AdminController $grid->created_at; $grid->updated_at; $grid->disableViewButton(); + $grid->disableCreateButton(); + $grid->disableDeleteButton(); $grid->filter(function (Grid\Filter $filter) { $filter->equal('id'); diff --git a/app/Models/LanzuUserBalance.php b/app/Models/LanzuUserBalance.php index d8e6950..c9b5b41 100644 --- a/app/Models/LanzuUserBalance.php +++ b/app/Models/LanzuUserBalance.php @@ -19,6 +19,7 @@ class LanzuUserBalance extends Model public static function getBalance($uid, $uType = 0) { $row = self::where(['source_id' => $uid, 'user_type' => $uType])->first(); + if ($row) { return $row->balance; } else {