This commit is contained in:
邓皓元 2019-05-10 17:12:45 +08:00
parent 39b3e31664
commit da983b4859

View File

@ -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);