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

Merge branch 'local' into dev

Browse Source
This commit is contained in:
邓皓元 2019-05-10 17:09:11 +08:00
commit 522d627c2d
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,6 @@ use App\Models\Card\Card;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Request;
use App\Models\Virtual\OrderCardPartition;
use Illuminate\Pagination\LengthAwarePaginator;
use App\Domains\Card\Repositories\CardRepository;
use App\Domains\Virtual\Repositories\OrderCardPartitionRepository;
@ -39,11 +38,27 @@ class CardService extends Service
public function index(array $conditions = [])
{
$limit = $conditions['limit'] ?? 20;
$conditions['type'] = isset($conditions['card_status']) ? [0, 1, 2] : 0;
$page = Request::get('page', 1);
$conditions['type'] = [0];
$total = $this->orderCardPartitionRepository->withConditions($conditions)->count();
$cards = $this->orderCardPartitionRepository->selectRaw('sim')->withConditions($conditions)->forPage($page, $limit)->get();
$select = [
'id',
'sim',
'company_name',
'package_name',
'created_at',
'updated_at',
];
if ($conditions['status']) {
$conditions['type'] = [0, 1, 2];
$simArray = $this->orderCardPartitionRepository->select('sim')->withConditions($conditions)->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 = static::transformer($cards);