From 16d2a26b78c9ba5789ff171e432b2ce006f51fe5 Mon Sep 17 00:00:00 2001 From: lanzu_qsy <334039090@qq.com> Date: Sat, 5 Sep 2020 11:50:26 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E7=A4=BE=E5=8C=BA=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E4=BA=8B=E7=89=A9,=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 961ce2f194c28ca40eb08a3474c87a0c0838051d. --- .../Controllers/LanzuCsInfoController.php | 70 +++++++++---------- 1 file changed, 32 insertions(+), 38 deletions(-) diff --git a/app/Admin/Controllers/LanzuCsInfoController.php b/app/Admin/Controllers/LanzuCsInfoController.php index bc95e6d..535b458 100644 --- a/app/Admin/Controllers/LanzuCsInfoController.php +++ b/app/Admin/Controllers/LanzuCsInfoController.php @@ -19,7 +19,6 @@ use Dcat\Admin\Grid; use Dcat\Admin\Show; use Dcat\Admin\Controllers\AdminController; use \App\Models\LanzuCsInfo as modelCsInfo; -use Illuminate\Support\Facades\DB; use function foo\func; class LanzuCsInfoController extends AdminController @@ -32,8 +31,6 @@ class LanzuCsInfoController extends AdminController protected function grid() { return Grid::make(new LanzuCsInfo('userBalance'), function (Grid $grid) { - $grid->model()->orderBy('created_at','desc'); - $grid->paginate(10); $user = Admin::user(); if ($user->isRole('lanzu_cs')) {//如何是社区站点角色登陆,则只能看到自己的信息 $grid->model()->where('admin_user_id', $user->id); @@ -45,7 +42,7 @@ class LanzuCsInfoController extends AdminController $grid->id->sortable(); $grid->name; $grid->phone; - $grid->column('绑定用户数')->display(function () { + $grid->column('绑定用户数')->display(function (){ return LanzuUserRelationBind::getCount($this->admin_user_id); }); $grid->column('userBalance.balance', '可提现金额'); @@ -112,31 +109,28 @@ class LanzuCsInfoController extends AdminController $form->saved(function (Form $form, $cid) { $model = new modelCsInfo(); if ($form->isCreating()) { - DB::transaction(function () use ($form, $model, $cid) { - //>>1.添加登录帐号 - $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs', 3); - if ($res == -1) { - return $form->error('该手机号作为登陆帐号已存在!'); - } elseif ($res == -2) { - return $form->error('添加失败!'); - } - - //>>2.生成小程序二维码 - $cs = $model->find($cid); - $aid = $cs->admin_user_id; - $images = new Images(); - $param = "p=index&sid={$aid}"; - $path = 'zh_cjdianc/pages/Liar/loginindex'; - $qrcode = $images->createQrCode($param, $path); - $fileName = 'public/upload/' . 'qrcode' . '/' . date('Y') . '/' . date('m-d') . '/' . rand(100000000000000, 999999999999999) . '.png'; - $result = $images->uploadOss($qrcode, $fileName); - if ($result == true) { - //>>3.保存二维码路径 - $cs->qrcode_path = $fileName; - $cs->save(); - } - }); + //>>1.添加登录帐号 + $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',3); + if ($res == -1) { + return $form->error('该手机号作为登陆帐号已存在!'); + } elseif ($res == -2) { + return $form->error('添加失败!'); + } + //>>2.生成小程序二维码 + $cs = $model->find($cid); + $aid = $cs->admin_user_id; + $images = new Images(); + $param = "p=index&sid={$aid}"; + $path = 'zh_cjdianc/pages/Liar/loginindex'; + $qrcode = $images->createQrCode($param, $path); + $fileName = 'public/upload/' . 'qrcode' . '/' . date('Y') . '/' . date('m-d') . '/' . rand(100000000000000, 999999999999999) . '.png'; + $result = $images->uploadOss($qrcode, $fileName); + if ($result == true) { + //>>3.保存二维码路径 + $cs->qrcode_path = $fileName; + $cs->save(); + } } else { //>>4.编辑时同步登陆帐号状态 $adu = new AdminUsers(); @@ -149,32 +143,32 @@ class LanzuCsInfoController extends AdminController }); //删除成功后 - $form->deleted(function (Form $form, $result) { - if (!$result) { + $form->deleted(function (Form $form,$result) { + if (!$result){ return $form->error('数据删除失败!'); } $data = $form->model()->toArray(); - foreach ($data as $val) { + foreach ($data as $val){ //删除登陆帐号 $adu = AdminUsers::find($val['admin_user_id']); - if ($adu) { + if ($adu){ $adu->delete(); } //删除提现余额 - $lb = LanzuUserBalance::where('source_id', $val['admin_user_id'])->first(); - if ($lb) { + $lb = LanzuUserBalance::where('source_id',$val['admin_user_id'])->first(); + if ($lb){ $lb->delete(); } //软删除提现申请 - LanzuCsWithdraw::where('cs_id', $val['id'])->update(['deleted_at' => time()]); + LanzuCsWithdraw::where('cs_id',$val['id'])->update(['deleted_at'=>time()]); //删除流水 $fr = FinancialRecord::getFinancialRecordModel($val['admin_user_id']); - if ($fr) { - $fr::where('user_id', $val['admin_user_id'])->delete(); + if ($fr){ + $fr::where('user_id',$val['admin_user_id'])->delete(); } @@ -183,7 +177,7 @@ class LanzuCsInfoController extends AdminController }); $form->disableViewButton(); $adu = Admin::user(); - if ($adu->isRole('lanzu_cs')) {//社区帐号不能删除自己的信息 + if ($adu->isRole('lanzu_cs')){//社区帐号不能删除自己的信息 $form->disableDeleteButton(); } });