管理津贴流水过滤

app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php

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