From 884b0d0b782d774fda987f868d8cc7cef29c51bd Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Tue, 12 Nov 2024 16:01:01 +0800
Subject: [PATCH] feat : site

---
 app/Request/Admin/SiteRequest.php        | 1 +
 app/Service/Admin/System/SiteService.php | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Request/Admin/SiteRequest.php b/app/Request/Admin/SiteRequest.php
index a627136..f6fafb5 100644
--- a/app/Request/Admin/SiteRequest.php
+++ b/app/Request/Admin/SiteRequest.php
@@ -103,6 +103,7 @@ class SiteRequest extends FormRequest
             'limit',
             'query_driver_name',
             'query_driver_city_id',
+            'query_driver_id'
         ]
     ];
 }
diff --git a/app/Service/Admin/System/SiteService.php b/app/Service/Admin/System/SiteService.php
index 9cd0e34..064a030 100644
--- a/app/Service/Admin/System/SiteService.php
+++ b/app/Service/Admin/System/SiteService.php
@@ -121,7 +121,7 @@ class SiteService extends BaseService
                 $query->where('kitchen_id', $kitchenId);
             })
             ->when($driverId = $this->request->input('query_driver_id'), function ($query) use ($driverId) {
-                $query->where('driver_id', $driverId);
+                $query->where('delivered_id', $driverId);
             })
             ->when(!empty($createTimeStart) && !empty($createTimeEnd), function ($query) use ($createTimeStart, $createTimeEnd) {
                 $query->whereBetween('create_time', [$createTimeStart, $createTimeEnd]);
@@ -369,6 +369,9 @@ class SiteService extends BaseService
             ->when($cityId > 0, function ($query) use ($cityId) {
                 $query->whereIn('section_id', $this->adminSectionModel->getIdsByCityId($cityId));
             })
+            ->when($id = $this->request->input('query_driver_id'), function ($query) use ($id) {
+                $query->where('id', $id);
+            })
             ->paginate($limit,['chinese_name','id','mobile','status'])->toArray();
 
         return $this->return->success('success',$list);