From 3fc93b725bbf7acfdb64c8e66520e4ca3a00ba9d Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Tue, 19 Nov 2019 17:51:32 +0800
Subject: [PATCH] uncancelled

---
 .../Virtual/Http/Controllers/FlowPoolController.php        | 2 +-
 .../Virtual/Repositories/Concerns/OrderCardConcern.php     | 7 +++++++
 app/Domains/Virtual/Services/FlowPoolService.php           | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/Domains/Virtual/Http/Controllers/FlowPoolController.php b/app/Domains/Virtual/Http/Controllers/FlowPoolController.php
index b4672cdd..dd4388c2 100644
--- a/app/Domains/Virtual/Http/Controllers/FlowPoolController.php
+++ b/app/Domains/Virtual/Http/Controllers/FlowPoolController.php
@@ -208,7 +208,7 @@ class FlowPoolController extends Controller
                     'company_id' => $flowPool->company_id,
                     'package_id' => $package_ids,
                     'unit_price' => 0,
-                    'card_status' => 2,
+                    'uncancelled' => 1,
                 ];
 
                 $cards = $repository->skipCache()->select([
diff --git a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
index 9c77c41f..147cfdf3 100644
--- a/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
+++ b/app/Domains/Virtual/Repositories/Concerns/OrderCardConcern.php
@@ -218,6 +218,13 @@ trait OrderCardConcern
             }
         }
 
+        if (isset($conditions['uncancelled'])) {
+            $date = isset($conditions['month']) ? Carbon::parse($conditions['month'])->copy()->startOfMonth() : date('Y-m-d H:i:s');
+            $this->model = $this->model->whereHas('card', function ($relation) use ($date) {
+                $relation->whereNull('cancelled_at')->orWhere('cancelled_at', "<", $date);
+            });
+        }
+
         return $this;
     }
 }
diff --git a/app/Domains/Virtual/Services/FlowPoolService.php b/app/Domains/Virtual/Services/FlowPoolService.php
index e3346028..ce207235 100644
--- a/app/Domains/Virtual/Services/FlowPoolService.php
+++ b/app/Domains/Virtual/Services/FlowPoolService.php
@@ -141,7 +141,7 @@ class FlowPoolService extends Service
             'company_id' => $company_ids,
             'package_id' => $package_ids,
             'unit_price' => 0,
-            'card_status' => 2,
+            'uncancelled' => 1,
         ];
 
         $cards = app(OrderCardPartitionRepository::class)->skipCache()->select([
@@ -455,7 +455,7 @@ class FlowPoolService extends Service
             'company_id' => $flowPool->company_id,
             'package_id' => array_keys($settings),
             'unit_price' => 0,
-            'card_status' => 2,
+            'uncancelled' => 1,
         ];
 
         $cards = app(OrderCardPartitionRepository::class)->skipCache()->selectRaw('distinct sim as sim, package_id')->withConditions($cardConditions)->get();