hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

total

Browse Source
This commit is contained in:
邓皓元 2019-12-16 17:47:37 +08:00
parent 4733bcceef
commit 3d4540ed81
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
View File

@ -101,7 +101,6 @@ trait OrderCardConcern
}
if (isset($conditions['service_start_starttime']) && isset($conditions['service_start_endtime'])) {
$date = Carbon::parse($conditions['service_start_starttime']);
$havingRaw = sprintf(
"sim in (SELECT sim FROM virtual_order_cards_partition GROUP BY sim HAVING MIN(service_start_at) >= '%s' AND MIN(service_start_at) <= '%s')",
Carbon::parse($conditions['service_start_starttime']),

2
app/Domains/Virtual/Services/CardService.php
View File

@ -72,7 +72,7 @@ class CardService extends Service
$cards = $this->orderCardPartitionRepository->select($select)->where('type', 0)->whereIn('sim', $simArray)->get();
} else {
$total = $this->orderCardPartitionRepository->withConditions($conditions)->count();
$total = $this->orderCardPartitionRepository->select("COUNT(*) AS count")->withConditions($conditions)->get()->count;
$cards = $this->orderCardPartitionRepository->select($select)->withConditions($conditions)->orderBy('created_at', 'desc')->forPage($page, $limit)->get();
}