pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

优化管理津贴流水

release
李静 2022-04-19 13:57:41 +08:00
parent 433692d6a0
commit 9c48f1bb91
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php
View File

@ -18,12 +18,8 @@ class ManageSubsidyLogController extends Controller
*/ */
public function index(Request $request) public function index(Request $request)
{ {
$isComplted = (bool) $request->input('is_completed');
$perPage = Paginator::resolvePerPage('per_page', 20, 50); $perPage = Paginator::resolvePerPage('per_page', 20, 50);
$manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order.user'])
->when($isComplted, function ($query) {
$tz = now(); $tz = now();
if ($tz->day >= 20) { if ($tz->day >= 20) {
@ -37,11 +33,10 @@ class ManageSubsidyLogController extends Controller
$startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay(); $startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay();
} }
$query->where('order_completed_at', '>=', $startAt)->latest('order_completed_at'); $manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order.user'])
}, function ($query) { ->where('order_completed_at', '>=', $startAt)
$query->whereNull('order_completed_at')->latest('id');
})
->where('user_id', $request->user()->id) ->where('user_id', $request->user()->id)
->latest('order_completed_at')
->simplePaginate($perPage); ->simplePaginate($perPage);
return DealerManageSubsidyLogResource::collection($manageSubsidyLogs); return DealerManageSubsidyLogResource::collection($manageSubsidyLogs);