diff --git a/app/Domains/Virtual/Repositories/OrderCardPartitionRepository.php b/app/Domains/Virtual/Repositories/OrderCardPartitionRepository.php index 59279a80..e78ee40c 100644 --- a/app/Domains/Virtual/Repositories/OrderCardPartitionRepository.php +++ b/app/Domains/Virtual/Repositories/OrderCardPartitionRepository.php @@ -33,6 +33,14 @@ class OrderCardPartitionRepository extends Repository 'created_at' => 'like', ]; + public static $tables = [ + 0 => 'virtual_order_cards', + 1 => 'virtual_order_renewal_cards', + 2 => 'virtual_order_renewal_package_cards', + 3 => 'virtual_order_flows_package_cards', + 7 => 'virtual_order_upgrade_cards', + ]; + public function model() { return Model::class; diff --git a/app/Domains/Virtual/Services/PropertyService.php b/app/Domains/Virtual/Services/PropertyService.php index 50c42939..22c900df 100644 --- a/app/Domains/Virtual/Services/PropertyService.php +++ b/app/Domains/Virtual/Services/PropertyService.php @@ -10,6 +10,7 @@ use App\Models\Virtual\PropertySetting; use App\Exceptions\InvalidArgumentException; use App\Domains\Virtual\Repositories\ProductRepository; use App\Domains\Virtual\Repositories\PropertyRepository; +use App\Domains\Virtual\Repositories\OrderCardRepository; use App\Domains\Virtual\Repositories\PropertySettingRepository; use App\Domains\Virtual\Repositories\OrderCardPartitionRepository; @@ -183,13 +184,13 @@ class PropertyService extends Service return $item->company_id . '_' . $item->package_id; })->toArray(); - $sells = DB::table('virtual_order_cards')->selectRaw('company_id, package_id, count(*) as counts') + $sells = app(OrderCardRepository::class)->selectRaw('company_id, package_id, count(*) as counts') ->groupBy(['company_id', 'package_id'])->get()->keyBy(function ($item) { return $item->company_id . '_' . $item->package_id; - })->collect()->toArray(); + })->toArray(); - $actives = app(OrderCardPartitionRepository::class)->selectRaw('company_id, package_id, count(*) as counts') - ->withConditions(['type' => 0, 'card_status' => 2])->groupBy(['company_id', 'package_id'])->get()->keyBy(function ($item) { + $actives = app(OrderCardRepository::class)->selectRaw('company_id, package_id, count(*) as counts') + ->withConditions(['card_status' => 2])->groupBy(['company_id', 'package_id'])->get()->keyBy(function ($item) { return $item->company_id . '_' . $item->package_id; })->toArray();