From 9bcae5940cda3f9bc09ba5b3f2c994a0145808fa Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Mon, 22 Apr 2019 10:49:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=BF=80=E6=B4=BB=E6=97=B6=E9=97=B4=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Domains/Card/Services/CardService.php | 10 +++++-----
 tests/MongoTest.php                       | 24 ++++++-----------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/app/Domains/Card/Services/CardService.php b/app/Domains/Card/Services/CardService.php
index cca050b3..43d1e60c 100644
--- a/app/Domains/Card/Services/CardService.php
+++ b/app/Domains/Card/Services/CardService.php
@@ -35,9 +35,9 @@ class CardService extends Service
         $values = [];
 
         foreach ($res as $value) {
-            $activated_at = $value['saDate'] ? $value['saDate']->toDateTime()->format('Y-m-d H:i:s') : null;
+            $activated_at = $value['saDate'] ? Carbon::createFromTimestampMs(strval($value['saDate'])) : null;
 
-            if ($activated_at && Carbon::parse($activated_at) < Carbon::parse('2000-01-01 00:00:00')) {
+            if ($activated_at && $activated_at < Carbon::parse('2000-01-01 00:00:00')) {
                 $activated_at = null;
             }
 
@@ -48,9 +48,9 @@ class CardService extends Service
                 'imsi' => $value['imsi'] ?? '',
                 'iccid' => $value['iccid'] ?? '',
                 'carrier_operator' => self::$carrierOperators[$value['oType']] ?? 255,
-                'activated_at'  => $activated_at,
-                'virtual_activated_at'  => $activated_at,
-                'created_at' =>  $value['sDate'] ? $value['sDate']->toDateTime()->format('Y-m-d H:i:s') : null,
+                'activated_at'  => (string)$activated_at,
+                'virtual_activated_at'  => (string)$activated_at,
+                'created_at' =>  $value['sDate'] ? (string)Carbon::createFromTimestampMs(strval($value['sDate'])) : null,
                 'updated_at' => date('Y-m-d H:i:s'),
             ];
         }
diff --git a/tests/MongoTest.php b/tests/MongoTest.php
index a7463b39..bebf36a5 100644
--- a/tests/MongoTest.php
+++ b/tests/MongoTest.php
@@ -1,25 +1,13 @@
 <?php
 
-use App\Models\Mongo\TblCard;
-use MongoDB\BSON\UTCDateTime;
+use App\Domains\Card\Services\CardService;
 
 require_once realpath(dirname(__FILE__) . '/TestCase.php');
 
-$nextMicrotime = intval(microtime(true) * 1000);
+$simArray = [
+    '1064917585595'
+];
 
-$utcDateTime = new UTCDateTime($nextMicrotime);
+$res = CardService::getMongoCardsInfo($simArray);
 
-$query = TblCard::select(['cNo', 'bNo', 'iccid', 'imsi', 'comId', 'oType', 'saDate', 'sDate', 'oRDate'])
-        ->where('pNo', 'No00000000768')
-        ->where('oRDate', '>', $utcDateTime)
-        ->where('oRDate', 'exists', true)
-        ->where('sDate', 'exists', true)
-        ->orderBy('sDate');
-
-$res = $query->first();
-
-if (!$res['oRDate']) {
-    dd($res->toArray());
-}
-
-dd(intval($res['oRDate']->toDateTime()->format('U.u') * 1000) - 1 );
+dd($res);