diff --git a/app/Domains/Virtual/Services/CardService.php b/app/Domains/Virtual/Services/CardService.php index ec849268..c379684d 100644 --- a/app/Domains/Virtual/Services/CardService.php +++ b/app/Domains/Virtual/Services/CardService.php @@ -54,10 +54,10 @@ class CardService extends Service if ($conditions['status']) { $conditions['type'] = [0, 1, 2]; - $simArray = $this->orderCardPartitionRepository->select('sim')->withConditions($conditions)->forPage($page, $limit)->get()->pluck('sim')->toArray(); + $simArray = $this->orderCardPartitionRepository->select('sim')->withConditions($conditions)->orderBy('service_end_at', 'desc')->forPage($page, $limit)->get()->pluck('sim')->toArray(); $cards = $this->orderCardPartitionRepository->select($select)->whereIn('sim', $simArray)->get(); } else { - $cards = $this->orderCardPartitionRepository->select($select)->withConditions($conditions)->forPage($page, $limit)->get(); + $cards = $this->orderCardPartitionRepository->select($select)->withConditions($conditions)->orderBy('service_end_at', 'desc')->forPage($page, $limit)->get(); } $cards = static::transformer($cards);