xuanchen/pingan_new
0
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

去掉是否平安项目校验

Browse Source
This commit is contained in:
徐永宾
2020-09-02 11:29:02 +08:00
parent 5397d931f7
commit a18087bc6d
7 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Controllers/Account/IndexController.php
View File

@@ -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);
});
}

11
app/Admin/Controllers/Coupon/IndexController.php
View File

@@ -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'));
});

3
app/Admin/Controllers/Finance/IndexController.php
View File

@@ -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');

11
app/Admin/Controllers/Finance/LogController.php
View File

@@ -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) {

2
app/Admin/Controllers/User/IndexController.php
View File

@@ -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);
}
});