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

卡券列表加券码搜索

Browse Source
This commit is contained in:
徐永宾
2020-08-11 11:30:24 +08:00
parent f99da0c837
commit 4d74786794
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,7 @@ class CouponController extends AdminController
$filter->column(1 / 2, function ($filter) { $filter->column(1 / 2, function ($filter) {
$filter->equal('status', '状态')->select(ActivityCoupon::STATUS); $filter->equal('status', '状态')->select(ActivityCoupon::STATUS);
$filter->between('used_at', '核销时间')->datetime(); $filter->between('used_at', '核销时间')->datetime();
$users = User::whereHas('identity', function ($query) { $users = User::whereHas('identity', function ($query) {
$query->where('identity_id', 1); $query->where('identity_id', 1);
})->get()->pluck('nickname', 'id'); })->get()->pluck('nickname', 'id');
@@ -34,7 +34,7 @@ class CouponController extends AdminController
}); });
$filter->column(1 / 2, function ($filter) { $filter->column(1 / 2, function ($filter) {
$filter->like('redemptionCode', '平安券编号'); $filter->like('code', '平安券编号');
$filter->where(function ($query) { $filter->where(function ($query) {
$query->whereHas('activity', function ($query) { $query->whereHas('activity', function ($query) {
$query->whereHas('rule', function ($query) { $query->whereHas('rule', function ($query) {

2
packages/coupon/src/Action/Init.php
View File

@@ -148,7 +148,7 @@ class Init
} }
/** /**
* Notes: 校验是否已经核销过。3秒内视为同一订单。不能提交订单id 只能这么办 * Notes: 校验是否已经核销过
* @Author: 玄尘 * @Author: 玄尘
* @Date : 2020/8/8 13:43 * @Date : 2020/8/8 13:43
*/ */