diff --git a/app/Admin/Actions/Coupon/Batch.php b/app/Admin/Actions/Coupon/Batch.php index 5244a67..0aabbd1 100644 --- a/app/Admin/Actions/Coupon/Batch.php +++ b/app/Admin/Actions/Coupon/Batch.php @@ -9,7 +9,8 @@ use Illuminate\Http\Request; class Batch extends Action { - public $name = '批量打款'; + + public $name = '批量打款'; protected $selector = '.import-post'; @@ -31,18 +32,18 @@ class Batch extends Action $error++; } } + return $this->response()->success("处理完成,成功:{$success}条,失败:{$error}条")->refresh(); } public function form() { $users = User::query() - ->whereHas('identity', function ($query) { - $query->where('identity_id', 1); - }) - ->where('type', 'pingan') - ->get() - ->pluck('nickname', 'id'); + ->whereHas('identity', function ($query) { + $query->where('identity_id', 1); + }) + ->get() + ->pluck('nickname', 'id'); $this->select('user_id', '渠道')->options($users)->required(); // 时间日期选择 @@ -55,4 +56,5 @@ class Batch extends Action 批量打款 HTML; } + } diff --git a/app/Admin/Controllers/Account/IndexController.php b/app/Admin/Controllers/Account/IndexController.php index 971adc0..a320105 100644 --- a/app/Admin/Controllers/Account/IndexController.php +++ b/app/Admin/Controllers/Account/IndexController.php @@ -20,7 +20,7 @@ class IndexController extends AdminController 'accountable', User::class, function ($query) { - $query->where('type', 'pingan')->whereHas('identity', function ($q) { + $query->whereHas('identity', function ($q) { $q->where('identity_id', 1); }); } diff --git a/app/Admin/Controllers/Coupon/IndexController.php b/app/Admin/Controllers/Coupon/IndexController.php index 215a131..2277197 100644 --- a/app/Admin/Controllers/Coupon/IndexController.php +++ b/app/Admin/Controllers/Coupon/IndexController.php @@ -38,13 +38,10 @@ class IndexController extends AdminController '3' => '核销失败', ]); $filter->between('created_at', '核销时间')->datetime(); - $users = User::query() - ->whereHas('identity', function ($query) { - $query->where('identity_id', 1); - }) - ->where('type', 'pingan') - ->get() - ->pluck('nickname', 'id'); + $users = User::whereHas('identity', function ($query) { + $query->where('identity_id', 1); + })->get()->pluck('nickname', 'id'); + $filter->equal('user_id', '渠道')->select($users); $filter->equal('thirdPartyGoodsId', '优惠政策')->select(ActivityRule::pluck('title', 'code')); }); diff --git a/app/Admin/Controllers/Finance/IndexController.php b/app/Admin/Controllers/Finance/IndexController.php index f36a2af..f557dcf 100644 --- a/app/Admin/Controllers/Finance/IndexController.php +++ b/app/Admin/Controllers/Finance/IndexController.php @@ -13,7 +13,7 @@ use Encore\Admin\Grid; class IndexController extends AdminController { - protected $title = '平安渠道打款处理'; + protected $title = '渠道打款处理'; /** * Notes: @@ -59,7 +59,6 @@ class IndexController extends AdminController ->whereHas('identity', function ($query) { $query->where('identity_id', 1); }) - ->where('type', 'pingan') ->get() ->pluck('nickname', 'id'); diff --git a/app/Admin/Controllers/Finance/LogController.php b/app/Admin/Controllers/Finance/LogController.php index a7c593d..1672fb8 100644 --- a/app/Admin/Controllers/Finance/LogController.php +++ b/app/Admin/Controllers/Finance/LogController.php @@ -33,13 +33,10 @@ class LogController extends AdminController $grid->filter(function ($filter) { $filter->column(1 / 2, function ($filter) { $filter->between('paid_at', '打款时间')->datetime(); - $users = User::query() - ->whereHas('identity', function ($query) { - $query->where('identity_id', 1); - }) - ->where('type', 'pingan') - ->get() - ->pluck('nickname', 'id'); + $users = User::whereHas('identity', function ($query) { + $query->where('identity_id', 1); + })->get()->pluck('nickname', 'id'); + $filter->equal('user_id', '渠道')->select($users); }); $filter->column(1 / 2, function ($filter) { diff --git a/app/Admin/Controllers/User/IndexController.php b/app/Admin/Controllers/User/IndexController.php index 2693992..4b5b260 100644 --- a/app/Admin/Controllers/User/IndexController.php +++ b/app/Admin/Controllers/User/IndexController.php @@ -43,7 +43,7 @@ class IndexController extends AdminController $actions->add(new Callback); } - if ($actions->row->type == 'pingan' && $actions->row->identity_id == 1 && $user->id == 1) { + if ($actions->row->identity_id == 1 && $user->id == 1) { $actions->add(new Profit); } }); diff --git a/app/Admin/Imports/User.php b/app/Admin/Imports/User.php index da73a3f..41a1ea8 100644 --- a/app/Admin/Imports/User.php +++ b/app/Admin/Imports/User.php @@ -17,7 +17,7 @@ class User implements ToCollection foreach ($rows as $row) { $user = UserModel::whereHas('info', function ($q) use ($row) { $q->where('nickname', $row[1]); - })->where('type', 'pingan')->whereNull('PaOutletId')->first(); + })->whereNull('PaOutletId')->first(); if ($user) { $user->PaOutletId = $row[2]; @@ -29,6 +29,7 @@ class User implements ToCollection if (count($error) > 0) { dd($error); + return implode(' ,', $error); }