wupengfei 3 years ago
parent
commit
2ebdd95c44
2 changed files with 14 additions and 2 deletions
  1. 13 1
      application/api/controller/General.php
  2. 1 1
      application/common.php

+ 13 - 1
application/api/controller/General.php

@@ -103,16 +103,28 @@ class General extends Base
      * @header name:Authorization require:1 desc:Token
      * @param name:company_id type:int require:1 default:-- desc:快递id(订单express_company_id字段)
      * @param name:send_no type:string require:1 default:-- desc:单号
+     * @return name:number type:string default:-- desc:单号
+     * @return name:type type:string default:-- desc:快递类型
      * @return name:list type:array default:-- desc:数据列表
      * @return name:list.time type:string default:-- desc:时间
      * @return name:list.status type:string default:-- desc:内容
+     * @return name:deliverystatus type:int default:-- desc:0:快递收件(揽件)1.在途中 2.正在派件 3.已签收 4.派送失败 5.疑难件 6.退件签收
+     * @return name:issign type:int default:-- desc:是否签收(1.是否签收)
+     * @return name:expName type:string default:-- desc:快递公司名称
+     * @return name:expSite type:string default:-- desc:快递公司官网
+     * @return name:expPhone type:string default:-- desc:快递公司电话
+     * @return name:courier type:string default:-- desc:快递员 或 快递站(没有则为空)
+     * @return name:courierPhone type:string default:-- desc:快递员电话 (没有则为空)
+     * @return name:updateTime type:string default:-- desc:快递轨迹信息最新时间
+     * @return name:takeTime type:string default:-- desc:发货到收货消耗时长 (截止最新轨迹)
+     * @return name:logo type:string default:-- desc:快递公司LOGO
      */
     public function deliveryDetails(){
         $company_id = input('get.company_id');
         $send_no = input('get.send_no');
         $company_info = Db::table('store_express_company')->find($company_id);
         $data = get_delivery($send_no,$company_info['express_code']);
-        $this->success('ok',['list'=>$data]);
+        $this->success('ok',$data);
     }
 
 

+ 1 - 1
application/common.php

@@ -241,7 +241,7 @@ function get_delivery($send_no = 'JD0053309649641',$express_code='jd'){
         $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
         list($header, $body) = explode("\r\n\r\n", $out_put, 2);
         if ($httpCode == 200) {
-            return json_decode($body,true)['result']['list'];
+            return json_decode($body,true)['result'];
         } else {
             return [];
            /* if ($httpCode == 400 && strpos($header, "Invalid Param Location") !== false) {