hehele/hyperf_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat : site

Browse Source
This commit is contained in:
ctexthuang
2024-11-12 16:01:01 +08:00
parent 8d19882045
commit 884b0d0b78
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Request/Admin/SiteRequest.php
View File

@@ -103,6 +103,7 @@ class SiteRequest extends FormRequest
'limit', 'limit',
'query_driver_name', 'query_driver_name',
'query_driver_city_id', 'query_driver_city_id',
'query_driver_id'
] ]
]; ];
} }

5
app/Service/Admin/System/SiteService.php
View File

@@ -121,7 +121,7 @@ class SiteService extends BaseService
$query->where('kitchen_id', $kitchenId); $query->where('kitchen_id', $kitchenId);
}) })
->when($driverId = $this->request->input('query_driver_id'), function ($query) use ($driverId) { ->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) { ->when(!empty($createTimeStart) && !empty($createTimeEnd), function ($query) use ($createTimeStart, $createTimeEnd) {
$query->whereBetween('create_time', [$createTimeStart, $createTimeEnd]); $query->whereBetween('create_time', [$createTimeStart, $createTimeEnd]);
@@ -369,6 +369,9 @@ class SiteService extends BaseService
->when($cityId > 0, function ($query) use ($cityId) { ->when($cityId > 0, function ($query) use ($cityId) {
$query->whereIn('section_id', $this->adminSectionModel->getIdsByCityId($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(); ->paginate($limit,['chinese_name','id','mobile','status'])->toArray();
return $this->return->success('success',$list); return $this->return->success('success',$list);