|
|
|
@ -58,19 +58,18 @@ class StoreService implements StoreServiceInterface |
|
|
|
->first(); |
|
|
|
} |
|
|
|
|
|
|
|
public function getList($marketId,$ids, $page=1, $pagesize=10) |
|
|
|
public function getList($marketId,$ids = [], $page=1, $pagesize=10) |
|
|
|
{ |
|
|
|
$market = Market::query()->withoutGlobalScope('normal')->find($marketId); |
|
|
|
$builder = Store::query()->where('market_id',$marketId); |
|
|
|
if(!is_null($ids)){ |
|
|
|
$ids = explode(',',$ids); |
|
|
|
$builder->whereNotIn('id',$ids); |
|
|
|
} |
|
|
|
$paginate = $builder->orderBy('is_rest', 'asc')->paginate($pagesize); |
|
|
|
$stores = $paginate->toArray(); |
|
|
|
$market->stores = $stores['data']; |
|
|
|
$newIds = array_values(array_column($stores['data'], 'id')); |
|
|
|
$ids = array_merge($ids,$newIds); |
|
|
|
$ids = array_merge($newIds,$ids); |
|
|
|
$ids = implode(',',$ids); |
|
|
|
return ['has_more_pages' => $paginate->hasMorePages(), 'market' => $market,'ids' => $ids]; |
|
|
|
} |
|
|
|
|