This commit is contained in:
邓皓元 2019-04-18 11:36:58 +08:00
parent 9955ddcb77
commit 231d1cc4d2

View File

@ -8,6 +8,7 @@ use Illuminate\Support\Facades\DB;
use App\Domains\Virtual\Services\PackageService;
use App\Domains\Virtual\Services\ProductService;
use App\Domains\Virtual\Repositories\OrderCardPartitionRepository;
use App\Models\Virtual\OrderCardPartition;
class CardController extends Controller
{
@ -42,6 +43,19 @@ class CardController extends Controller
$cards = $this->orderCardPartitionRepository->select(['sim', DB::raw('MIN(company_id) as company_id')])->withConditions($conditions)->groupBy('sim')->paginate($limit);
if ($this->request->has('sim')) {
$simArray = $this->request->ids('sim');
$cardArray = $cards->pluck('sim')->toArray();
foreach ($simArray as $key => $value) {
if(!in_array($value, $cardArray)){
$cards->push(new OrderCardPartition(['sim' => $value, 'company_id' => 0]));
}
}
}
$services = $this->orderCardPartitionRepository->selectRaw('sim,MIN(service_start_at) as service_start_at,MAX(service_end_at) as service_end_at')
->whereIn('sim', $cards->pluck('sim')->toArray())->groupBy('sim')->get()->keyBy('sim');