xuanchen/pingan_unionpay
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

优化访问

Browse Source
This commit is contained in:
徐永宾
2020-08-24 16:40:29 +08:00
parent 245d5daa50
commit 59164c2c56
2 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Admin/Controllers/Activity/CouponController.php
View File

@@ -6,7 +6,6 @@ use App\Models\ActivityCoupon;
use App\Models\ActivityRule;
use App\Models\User;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
class CouponController extends AdminController
@@ -30,11 +29,17 @@ class CouponController extends AdminController
$query->where('identity_id', 1);
})->get()->pluck('nickname', 'id');
$filter->equal('activity.user_id', '渠道')->select(array_merge(['0' => '系统'], $users->toArray()));
$filter->where(function ($query) {
$query->whereHas('outlet', function ($query) {
$query->whereHas('info', function ($query) {
$query->where('nickname', 'like', "%{$this->input}%");
});
});
}, '网点名称', 'outlet_name');
});
$filter->column(1 / 2, function ($filter) {
$filter->like('code', '平安券编号');
$filter->like('code', '卡券编号');
$filter->where(function ($query) {
$query->whereHas('activity', function ($query) {
$query->whereHas('rule', function ($query) {
@@ -42,6 +47,21 @@ class CouponController extends AdminController
});
});
}, '优惠政策', 'rule_code')->select(ActivityRule::where('status', 1)->pluck('title', 'code'));
$users = User::query()
->whereHas('identity', function ($query) {
$query->where('identity_id', 1);
})
->get()
->pluck('nickname', 'id');
$filter->where(function ($query) {
$query->whereHas('outlet', function ($query) {
$query->whereHas('parent', function ($query) {
$query->where('id', $this->input);
});
});
}, '渠道', 'parent_id')->select($users);;
});
});
@@ -51,9 +71,11 @@ class CouponController extends AdminController
$grid->column('优惠政策')->display(function () {
return $this->activity->rule->title;
});
$grid->column('agent', '所属渠道')->display(function () {
return $this->activity->user_nickname;
$grid->column('网点名称/编号')->display(function () {
return $this->outlet ? $this->outlet->nickname : $this->outletId;
});
$grid->column('code', '卡券编号');
$grid->column('status', '状态')
->using(ActivityCoupon::STATUS)
@@ -75,7 +97,7 @@ class CouponController extends AdminController
$export->column('mobile', function ($value, $original) {
return $value . "\t";
});
$export->filename($this->title . date("YmdHis"));
});