物流抽象状态名称调整

Author: thisliu

README.md

@@ -14,11 +14,11 @@
  2. 快递100 类名由 `Kuaidi100` 修改为 `Kd100`
  3. 返回物流状态已统一,具体请查看：`src/Interfaces/LogisticsStatus.php`
  4. 抽象物流状态为五种结果：
-    * `has_progresses`: 是否已经有动态
-    * `progress_cutoff`: 动态是否已经截止
-    * `is_signed`: 是否签收
-    * `is_troublesome`: 是否问题件
-    * `is_return`: 是否退回件
+    * `has_active`: 是否已经有动态
+    * `has_ended`: 动态是否已经截止
+    * `has_signed`: 是否签收
+    * `has_troubled`: 是否问题件
+    * `has_returned`: 是否退回件
 
 ## 介绍
 
@@ -101,11 +101,11 @@ $order = $logistics->query('805741929402797742', '圆通');
     "status": 4,
     "display_status": "已签收",
     "abstract_status": {
-        "has_progresses" : true,
-        "progress_cutoff" : true,
-        "is_signed" : true,
-        "is_troublesome" : false,
-        "is_return" : false
+        "has_active" : true,
+        "has_ended" : true,
+        "has_signed" : true,
+        "has_troubled" : false,
+        "has_returned" : false
     },
     "list": [
         {

src/Providers/AbstractProvider.php

@@ -110,85 +110,85 @@ public function abstractLogisticsStatus($status)
             case self::LOGISTICS_STATUS_ERROR:
                 break;
             case self::LOGISTICS_STATUS_COURIER_RECEIPT:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_IN_TRANSIT:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_DELIVERING:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_SIGNED:
-                $hasProgresses = true;
-                $progressCutoff = true;
-                $isSigned = true;
+                $hasActive = true;
+                $hasEnded = true;
+                $hasSigned = true;
 
                 break;
             case self::LOGISTICS_STATUS_DELIVERY_FAILED:
-                $hasProgresses = true;
-                $progressCutoff = true;
-                $isTroublesome = false;
+                $hasActive = true;
+                $hasEnded = true;
+                $hasTroubled = false;
 
                 break;
             case self::LOGISTICS_STATUS_TROUBLESOME:
-                $isTroublesome = false;
+                $hasTroubled = false;
 
                 break;
             case self::LOGISTICS_STATUS_RETURN_RECEIPT:
-                $hasProgresses = true;
-                $progressCutoff = true;
-                $isTroublesome = true;
-                $isReturn = true;
+                $hasActive = true;
+                $hasEnded = true;
+                $hasTroubled = true;
+                $hasReturned = true;
 
                 break;
             case self::LOGISTICS_STATUS_REJECTED:
-                $hasProgresses = true;
-                $progressCutoff = true;
+                $hasActive = true;
+                $hasEnded = true;
 
                 break;
             case self::LOGISTICS_STATUS_SEND_BACK:
-                $hasProgresses = true;
-                $progressCutoff = true;
-                $isReturn = true;
+                $hasActive = true;
+                $hasEnded = true;
+                $hasReturned = true;
 
                 break;
             case self::LOGISTICS_STATUS_TIMEOUT:
-                $hasProgresses = true;
-                $progressCutoff = true;
+                $hasActive = true;
+                $hasEnded = true;
 
                 break;
             case self::LOGISTICS_STATUS_TO_BE_CLEARED:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_CLEARANCE:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_CLEARED:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
             case self::LOGISTICS_STATUS_CUSTOMS_CLEARANCE_ABNORMALITY:
-                $hasProgresses = true;
-                $isTroublesome = true;
+                $hasActive = true;
+                $hasTroubled = true;
 
                 break;
             case self::LOGISTICS_STATUS_AWAIT_SIGN:
-                $hasProgresses = true;
+                $hasActive = true;
 
                 break;
         }
 
         return [
-            'has_progresses' => isset($hasProgresses) ? $hasProgresses : false,
-            'progress_cutoff' => isset($progressCutoff) ? $progressCutoff : false,
-            'is_signed' => isset($isSigned) ? $isSigned : false,
-            'is_troublesome' => isset($isTroublesome) ? $isTroublesome : false,
-            'is_return' => isset($isReturn) ? $isReturn : false,
+            'has_active' => isset($hasActive) ? $hasActive : false,
+            'has_ended' => isset($hasEnded) ? $hasEnded : false,
+            'has_signed' => isset($hasSigned) ? $hasSigned : false,
+            'has_troubled' => isset($hasTroubled) ? $hasTroubled : false,
+            'has_returned' => isset($hasReturned) ? $hasReturned : false,
         ];
     }
 }