优化管理津贴流水

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

@@ -18,12 +18,8 @@ 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', 'order.user'])
-                                ->when($isComplted, function ($query) {
         $tz = now();
 
         if ($tz->day >= 20) {
@@ -37,11 +33,10 @@ class ManageSubsidyLogController extends Controller
             $startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay();
         }
 
-                                    $query->where('order_completed_at', '>=', $startAt)->latest('order_completed_at');
-                                }, function ($query) {
-                                    $query->whereNull('order_completed_at')->latest('id');
-                                })
+        $manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order.user'])
+                                ->where('order_completed_at', '>=', $startAt)
                                 ->where('user_id', $request->user()->id)
+                                ->latest('order_completed_at')
                                 ->simplePaginate($perPage);
 
         return DealerManageSubsidyLogResource::collection($manageSubsidyLogs);