Browse Source

Revert "社区添加增加了事物,优化数据列表排序"

This reverts commit 961ce2f194.
master
lanzu_qsy 5 years ago
parent
commit
16d2a26b78
  1. 30
      app/Admin/Controllers/LanzuCsInfoController.php

30
app/Admin/Controllers/LanzuCsInfoController.php

@ -19,7 +19,6 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Controllers\AdminController;
use \App\Models\LanzuCsInfo as modelCsInfo; use \App\Models\LanzuCsInfo as modelCsInfo;
use Illuminate\Support\Facades\DB;
use function foo\func; use function foo\func;
class LanzuCsInfoController extends AdminController class LanzuCsInfoController extends AdminController
@ -32,8 +31,6 @@ class LanzuCsInfoController extends AdminController
protected function grid() protected function grid()
{ {
return Grid::make(new LanzuCsInfo('userBalance'), function (Grid $grid) { return Grid::make(new LanzuCsInfo('userBalance'), function (Grid $grid) {
$grid->model()->orderBy('created_at','desc');
$grid->paginate(10);
$user = Admin::user(); $user = Admin::user();
if ($user->isRole('lanzu_cs')) {//如何是社区站点角色登陆,则只能看到自己的信息 if ($user->isRole('lanzu_cs')) {//如何是社区站点角色登陆,则只能看到自己的信息
$grid->model()->where('admin_user_id', $user->id); $grid->model()->where('admin_user_id', $user->id);
@ -45,7 +42,7 @@ class LanzuCsInfoController extends AdminController
$grid->id->sortable(); $grid->id->sortable();
$grid->name; $grid->name;
$grid->phone; $grid->phone;
$grid->column('绑定用户数')->display(function () {
$grid->column('绑定用户数')->display(function (){
return LanzuUserRelationBind::getCount($this->admin_user_id); return LanzuUserRelationBind::getCount($this->admin_user_id);
}); });
$grid->column('userBalance.balance', '可提现金额'); $grid->column('userBalance.balance', '可提现金额');
@ -112,9 +109,8 @@ class LanzuCsInfoController extends AdminController
$form->saved(function (Form $form, $cid) { $form->saved(function (Form $form, $cid) {
$model = new modelCsInfo(); $model = new modelCsInfo();
if ($form->isCreating()) { if ($form->isCreating()) {
DB::transaction(function () use ($form, $model, $cid) {
//>>1.添加登录帐号 //>>1.添加登录帐号
$res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs', 3);
$res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',3);
if ($res == -1) { if ($res == -1) {
return $form->error('该手机号作为登陆帐号已存在!'); return $form->error('该手机号作为登陆帐号已存在!');
} elseif ($res == -2) { } elseif ($res == -2) {
@ -135,8 +131,6 @@ class LanzuCsInfoController extends AdminController
$cs->qrcode_path = $fileName; $cs->qrcode_path = $fileName;
$cs->save(); $cs->save();
} }
});
} else { } else {
//>>4.编辑时同步登陆帐号状态 //>>4.编辑时同步登陆帐号状态
$adu = new AdminUsers(); $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('数据删除失败!'); return $form->error('数据删除失败!');
} }
$data = $form->model()->toArray(); $data = $form->model()->toArray();
foreach ($data as $val) {
foreach ($data as $val){
//删除登陆帐号 //删除登陆帐号
$adu = AdminUsers::find($val['admin_user_id']); $adu = AdminUsers::find($val['admin_user_id']);
if ($adu) {
if ($adu){
$adu->delete(); $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(); $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']); $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(); $form->disableViewButton();
$adu = Admin::user(); $adu = Admin::user();
if ($adu->isRole('lanzu_cs')) {//社区帐号不能删除自己的信息
if ($adu->isRole('lanzu_cs')){//社区帐号不能删除自己的信息
$form->disableDeleteButton(); $form->disableDeleteButton();
} }
}); });

Loading…
Cancel
Save