From 9cf3c81d194a01f83ab5a5dac26d4509164de1b6 Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Tue, 7 Jan 2020 11:10:53 +0800
Subject: [PATCH] OrderCardRepository

---
 app/Domains/Virtual/Exports/CardExport.php   | 5 +++--
 app/Domains/Virtual/Services/CardService.php | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Domains/Virtual/Exports/CardExport.php b/app/Domains/Virtual/Exports/CardExport.php
index 5f74a54d..6632eb71 100644
--- a/app/Domains/Virtual/Exports/CardExport.php
+++ b/app/Domains/Virtual/Exports/CardExport.php
@@ -14,6 +14,7 @@ use Dipper\Excel\Concerns\WithCustomQuerySize;
 use Dipper\Excel\Concerns\WithColumnFormatting;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use App\Domains\Virtual\Repositories\PropertyRepository;
+use App\Domains\Virtual\Repositories\OrderCardRepository;
 use App\Domains\Virtual\Repositories\OrderCardPartitionRepository;
 
 class CardExport extends AbstractExport implements FromQuery, WithHeadings, WithRows, WithColumnFormatting, WithCustomQuerySize, WithCustomChunkSize
@@ -53,7 +54,7 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With
             CardService::propConditions($this->conditions);
         }
 
-        return app(OrderCardPartitionRepository::class)->selectRaw("COUNT(*) AS count")->withConditions($this->conditions)->first()->count;
+        return app(OrderCardRepository::class)->selectRaw("COUNT(*) AS count")->withConditions($this->conditions)->first()->count;
     }
 
     public function query()
@@ -74,7 +75,7 @@ class CardExport extends AbstractExport implements FromQuery, WithHeadings, With
             'updated_at',
         ];
 
-        $builder = app(OrderCardPartitionRepository::class)->forceNoReset()->skipCache()->select($select)->withConditions($this->conditions)->orderBy('created_at', 'desc');
+        $builder = app(OrderCardRepository::class)->forceNoReset()->skipCache()->select($select)->withConditions($this->conditions)->orderBy('created_at', 'desc');
 
         return $builder;
     }
diff --git a/app/Domains/Virtual/Services/CardService.php b/app/Domains/Virtual/Services/CardService.php
index f926bb08..277be0ce 100644
--- a/app/Domains/Virtual/Services/CardService.php
+++ b/app/Domains/Virtual/Services/CardService.php
@@ -11,6 +11,7 @@ use Illuminate\Pagination\LengthAwarePaginator;
 use App\Domains\Card\Repositories\CardRepository;
 use App\Domains\Virtual\Repositories\PropertyRepository;
 use App\Domains\Virtual\Repositories\OrderCardPartitionRepository;
+use App\Domains\Virtual\Repositories\OrderCardRepository;
 
 class CardService extends Service
 {
@@ -56,8 +57,8 @@ class CardService extends Service
             'updated_at',
         ];
 
-        $total = $this->orderCardPartitionRepository->selectRaw("COUNT(*) AS count")->withConditions($conditions)->first()->count;
-        $cards = $this->orderCardPartitionRepository->select($select)->withConditions($conditions)->orderBy('created_at', 'desc')->forPage($page, $limit)->get();
+        $total = app(OrderCardRepository::class)->selectRaw("COUNT(*) AS count")->withConditions($conditions)->first()->count;
+        $cards = app(OrderCardRepository::class)->select($select)->withConditions($conditions)->orderBy('created_at', 'desc')->forPage($page, $limit)->get();
 
         $cards = static::transformer($cards);