merge

README.md

@@ -11,6 +11,7 @@ Cross Border Express for Yii2
 - 速递管家
 - 易仓物流
 - 顺丰国际物流
+- K5物流系统
 
 [![Latest Stable Version](https://poser.pugx.org/yiier/yii2-cross-border-express/v/stable)](https://packagist.org/packages/yiier/yii2-cross-border-express) 
 [![Total Downloads](https://poser.pugx.org/yiier/yii2-cross-border-express/downloads)](https://packagist.org/packages/yiier/yii2-cross-border-express) 
@@ -108,7 +109,12 @@ $config = [
             "username" => "",
             "checkword" => "",
             "platform_code" => "",
-        ]       
+        ], 
+		'k5' => [
+            "host" => "",
+            "clientid" => "",
+            "token" => "",
+        ],  
     ],
 ];
 

src/platforms/CourierbutlerPlatform.php

@@ -35,6 +35,37 @@ public function getClient()
         return $client;
     }
 
+
+    /**
+     * @param string $refrence_no 客户参考号
+     * @return string
+     * @throws ExpressException
+     */
+    public function getTracingNumber(string $refrence_no): string
+    {
+
+
+        $this->body["serviceMethod"] = "gettrackingnumber";
+        $this->body["paramsJson"] = json_encode([
+            'reference_no'=>$refrence_no
+        ], true);
+        try {
+            $result = $this->client->post($this->host . "/webservice/PublicService.asmx/ServiceInterfaceUTF8", [
+                'form_params' => $this->body,
+            ])->getBody();
+            $data = $this->parseResult($result);
+            //var_dump($data);exit;
+            return $data['shipping_method_no']?$data['shipping_method_no']:'';
+        } catch (ExpressException $exception) {
+            throw new ExpressException(sprintf("获取转单号失败: %s", $exception->getMessage()));
+        }
+
+        return "";
+    }
+
+
+
+
     /**
      * @param string $countryCode
      * @return array|Transport[]
@@ -59,7 +90,8 @@ public function createOrder(Order $order): OrderResult
             $orderResult = new OrderResult();
             $orderResult->data = json_encode($resData, true);
             $orderResult->expressNumber = !empty($resData["refrence_no"]) ? $resData["refrence_no"] : "";
-            $orderResult->expressTrackingNumber = !empty($resData["shipping_method_no"]) ? $resData["shipping_method_no"] : "";
+            $orderResult->expressTrackingNumber = !empty($resData["shipping_method_no"]) ? $resData["shipping_method_no"] : "";;
+            $orderResult->expressAgentNumber = !empty($resData["shipping_method_no"]) ? $resData["shipping_method_no"] : "";
             return $orderResult;
         } catch (ExpressException $exception) {
             throw new ExpressException(sprintf("创建包裹失败: %s", $exception->getMessage()));
@@ -129,7 +161,10 @@ public function getOrderAllFee(array $query = []): array
     protected function parseResult(string $result)
     {
         $res = json_decode($result, true);
-        if ($res["success"] == 1) {
+        if(!is_array($res)) {
+            throw new ExpressException('接口返回数据异常');
+        }
+        if (isset($res["success"]) && $res["success"] == 1) {
             return $res["data"];
         } else {
             throw new ExpressException($res["cnmessage"]);

src/platforms/FeitePlatform.php

@@ -119,6 +119,12 @@ public function getPrintUrl(string $orderNumber, array $params = []): string
         $response = $this->client->post($api, $body);
 
         $result = json_decode($response->getBody(), true);
+
+        // 返回unauthorized_client 错误的时候一般是因为token过期导致 所以强行清除一下
+        if($result['Status'] === 0 && $result['ErrCode'] === 'unauthorized_client') {
+            $cache = \Yii::$app->cache;
+            $cache->delete(self::CACHE_KEY_FEITE_ACCESS_TOKEN);
+        }
 
         try {
             $b64 = $result['Data']['Label'];