From 9c48f1bb91d298e98c2cd1828c4cca0251d65227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Tue, 19 Apr 2022 13:57:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AE=A1=E7=90=86=E6=B4=A5?=
 =?UTF-8?q?=E8=B4=B4=E6=B5=81=E6=B0=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dealer/ManageSubsidyLogController.php     | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php
index b4b3dbbc..9efb07d8 100644
--- a/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php
+++ b/app/Endpoint/Api/Http/Controllers/Dealer/ManageSubsidyLogController.php
@@ -18,30 +18,25 @@ class ManageSubsidyLogController extends Controller
      */
     public function index(Request $request)
     {
-        $isComplted = (bool) $request->input('is_completed');
-
         $perPage = Paginator::resolvePerPage('per_page', 20, 50);
 
+        $tz = now();
+
+        if ($tz->day >= 20) {
+            // 结算当月20号开始的管理津贴
+            $startAt = $tz->copy()->setDay(20)->startOfDay();
+        } elseif ($tz->day >= 5) {
+            // 结算当月5号开始的管理津贴
+            $startAt = $tz->copy()->setDay(5)->startOfDay();
+        } else {
+            // 结算上月20号开始的管理津贴
+            $startAt = $tz->copy()->subMonthNoOverflow()->setDay(20)->startOfDay();
+        }
+
         $manageSubsidyLogs = DealerManageSubsidyLog::with(['product', 'order.user'])
-                                ->when($isComplted, function ($query) {
-                                    $tz = now();
-
-                                    if ($tz->day >= 20) {
-                                        // 结算当月20号开始的管理津贴
-                                        $startAt = $tz->copy()->setDay(20)->startOfDay();
-                                    } elseif ($tz->day >= 5) {
-                                        // 结算当月5号开始的管理津贴
-                                        $startAt = $tz->copy()->setDay(5)->startOfDay();
-                                    } else {
-                                        // 结算上月20号开始的管理津贴
-                                        $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');
-                                })
+                                ->where('order_completed_at', '>=', $startAt)
                                 ->where('user_id', $request->user()->id)
+                                ->latest('order_completed_at')
                                 ->simplePaginate($perPage);
 
         return DealerManageSubsidyLogResource::collection($manageSubsidyLogs);