xuanchen/pingan_unionpay_new
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ceshi

Browse Source
This commit is contained in:
徐永宾
2021-07-30 15:46:28 +08:00
parent 1db138c354
commit 5c5078ee5e
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Merchant/Controllers/Coupon/IndexController.php
View File

@@ -220,13 +220,13 @@ class IndexController extends Controller
})
->where('status', 3)
->when($request->start && $request->end, function ($query) use ($request) {
$query->whereBetween('created_at', [$request->start, $request->end]);
$query->whereBetween('updated_at', [$request->start, $request->end]);
})
->when($request->start, function ($query) use ($request) {
$query->where('created_at', '>', $request->start);
$query->where('updated_at', '>', $request->start);
})
->when($request->end, function ($query) use ($request) {
$query->where('created_at', '<', $request->end);
$query->where('updated_at', '<', $request->end);
})
->count();
break;
@@ -272,13 +272,13 @@ class IndexController extends Controller
$query->whereIn('status', [2, 3]);
})
->when($request->start && $request->end, function ($query) use ($request) {
$query->whereBetween('created_at', [$request->start, $request->end]);
$query->whereBetween('updated_at', [$request->start, $request->end]);
})
->when($request->start, function ($query) use ($request) {
$query->where('created_at', '>', $request->start);
$query->where('updated_at', '>', $request->start);
})
->when($request->end, function ($query) use ($request) {
$query->where('created_at', '<', $request->end);
$query->where('updated_at', '<', $request->end);
})
->latest()
->chunk(5000, function ($coupons) use ($handle) {