diff --git a/app/Admin/Controllers/LanzuMmInfoController.php b/app/Admin/Controllers/LanzuMmInfoController.php index 0681a45..a7cd796 100644 --- a/app/Admin/Controllers/LanzuMmInfoController.php +++ b/app/Admin/Controllers/LanzuMmInfoController.php @@ -120,6 +120,7 @@ class LanzuMmInfoController extends AdminController protected function form() { return Form::make(new LanzuMmInfo(), function (Form $form) { + $form->display('id'); $form->text('user_id', '懒ID')->placeholder('对应懒族小程序个人中心的懒ID')->required(); $form->text('name')->required(); @@ -132,7 +133,7 @@ class LanzuMmInfoController extends AdminController $form->saved(function (Form $form, $mmid) { $model = new mmInfo(); if ($form->isCreating()) { - $res = Auth::addAdminUser($form, $model, $mmid, 'lanzu_mm',Type::BALANCE_USER_TYPE_MM); + $res = Auth::addAdminUser($form, $model, $mmid, 'lanzu_mm', Type::BALANCE_USER_TYPE_MM); if ($res == -1) { return $form->error('该手机号作为登陆帐号已存在!'); } elseif ($res == -2) { @@ -141,7 +142,7 @@ class LanzuMmInfoController extends AdminController } else { //>>4.编辑时同步登陆帐号状态 - $adu = new AdminUsers(); + $adu = new AdminUsers(); $id = $form->getKey(); $mm = mmInfo::find($id); $ad = $adu->find($mm->admin_user_id); @@ -149,6 +150,11 @@ class LanzuMmInfoController extends AdminController $ad->save(); } }); + $form->deleted(function (Form $form, $result) { + $ids = array_column($form->model()->toArray(), 'admin_user_id'); + //删除对应的登陆帐号 + AdminUsers::whereIn('id', $ids)->delete(); + }); }); } diff --git a/app/Admin/Controllers/LanzuMpInfoController.php b/app/Admin/Controllers/LanzuMpInfoController.php index ffc8b02..c9d4f69 100644 --- a/app/Admin/Controllers/LanzuMpInfoController.php +++ b/app/Admin/Controllers/LanzuMpInfoController.php @@ -138,6 +138,11 @@ class LanzuMpInfoController extends AdminController $ad->save(); } }); + $form->deleted(function (Form $form, $result) { + $ids = array_column($form->model()->toArray(), 'admin_user_id'); + //删除对应的登陆帐号 + AdminUsers::whereIn('id', $ids)->delete(); + }); }); } diff --git a/app/Admin/Controllers/LanzuMpWithdrawController.php b/app/Admin/Controllers/LanzuMpWithdrawController.php index c656a0b..48a88d7 100755 --- a/app/Admin/Controllers/LanzuMpWithdrawController.php +++ b/app/Admin/Controllers/LanzuMpWithdrawController.php @@ -146,19 +146,18 @@ class LanzuMpWithdrawController extends AdminController } else { $form->radio('status')->options([1 => '通过审核', -1 => '拒绝'])->default(-1); } - } $form->saved(function (Form $form, $result) { $adminUserId = $form->model()->mp_info['admin_user_id']; - $money = $form->model()->money; + $money = $form->model()->money; if ($form->isEditing()) { if ($form->status == -1) { //如果服务商提现审核被拒绝,退回服务商的提现金额 MpBalance::returnBalance($adminUserId, Type::BALANCE_USER_TYPE_MP, $money); - }elseif ($form->status==1){ + } elseif ($form->status == 1) { //如果审核通过,则记录流水 - FinancialRecord::addFinancialRecord($adminUserId,Type::BALANCE_USER_TYPE_MP,$money,102,'服务商提现','服务商提现'); + FinancialRecord::addFinancialRecord($adminUserId, Type::BALANCE_USER_TYPE_MP, $money, 102, '服务商提现', '服务商提现'); } } }); diff --git a/app/Models/AdminUsers.php b/app/Models/AdminUsers.php index 5f7106e..39cb6d4 100644 --- a/app/Models/AdminUsers.php +++ b/app/Models/AdminUsers.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class AdminUsers extends Model diff --git a/app/Models/LanzuMmInfo.php b/app/Models/LanzuMmInfo.php index aeae4a5..9d857f2 100644 --- a/app/Models/LanzuMmInfo.php +++ b/app/Models/LanzuMmInfo.php @@ -6,10 +6,12 @@ use Dcat\Admin\Admin; use Dcat\Admin\Traits\HasDateTimeFormatter; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; class LanzuMmInfo extends Model { use HasDateTimeFormatter; + use SoftDeletes; protected $table = 'lanzu_mm_info'; protected $dateFormat = 'U';