根据讨论结果 修改的wk的快递展示图

core/CoreApp/controllers/Apiexpress.php

@@ -33,7 +33,7 @@ class Apiexpress extends Start_Controller {
         $data = file_get_contents('PHP://input');
 		$data = json_decode($data, true);
         $shop = isset($data['shop'])?$data['shop']:"";
-        $waybill_no = isset($data['waybill'])?$data['waybill']:"";
+        $order_no = isset($data['order_no'])?$data['order_no']:"";
         
         $apply_time = isset($data['time'])?$data['time']:0;
       
@@ -68,7 +68,7 @@ class Apiexpress extends Start_Controller {
             die($this->logic_tools->ret_json(-1,"该店铺的秘钥不正确"));
         }
         
-        if(empty($waybill_no)){
+        if(empty($order_no)){
             die($this->logic_tools->ret_json(-1,"请求单号异常"));
         }
 
@@ -76,7 +76,7 @@ class Apiexpress extends Start_Controller {
         if(empty($table_name)){
             die($this->logic_tools->ret_json(-1,"店铺未开通此功能！！！"));
         }
-        $info = $this->logic_order->getInfoByTableName($table_name,"waybill = ".$waybill_no. " and  shop = ".$shop,"id,express,excontent,expressstate,waybill,dtime,printtime");
+        $info = $this->logic_order->getInfoByTableName($table_name,"orderinfo = ".$shop.$order_no. " and  shop = ".$shop,"id,express,excontent,expressstate,waybill,dtime,printtime");
         if(empty($info)){
             die($this->logic_tools->ret_json(-1,"未查询到相关快递信息"));
         }
@@ -97,14 +97,70 @@ class Apiexpress extends Start_Controller {
             }
             $express_trace = $re_arr;
         }
+        if(empty($info['dtime'])){
+            $preparing = [
+                "desc"=>"",
+                "status"=>0,
+                "date"=>"",
+            ];
+        }else{
+            $preparing = [
+                "desc"=>"The Order Has Been Created And TheMerchant lspreparing Your Order.",
+                "status"=>1,
+                "date"=>date("Y-m-d H:i:s",$info['dtime']),
+            ];
+        }
+
+        if(empty($info['printtime'])){
+            $warehouse_processing = [
+                "desc"=>"",
+                "status"=>0,
+                "date"=>"",
+            ];
+        }else{
+            $warehouse_processing = [
+                "desc"=>"Packing And Final Check",
+                "status"=>1,
+                "date"=>date("Y-m-d H:i:s",$info['printtime']),
+            ];
+        }
+        if(empty($shipping_time)){
+            $shipping = [
+                "desc"=>"",
+                "status"=>0,
+                "date"=>"",
+            ];
+        }else{
+            $shipping = [
+                "desc"=>"Courier Company Picked Up The Package",
+                "status"=>1,
+                "date"=>$shipping_time,
+            ];
+        }
+       
+        if(empty($receive_time)){
+            $received = [
+                "desc"=>"",
+                "status"=>0,
+                "date"=>"",
+            ];
+        }else{
+            $received = [
+                "desc"=>"Order signed for successfully",
+                "status"=>1,
+                "date"=>$receive_time,
+            ];
+        }
+       
         
         $ret_arr = [
+            "order_no"=>$order_no,
             "express_name"=>$express_info['iscode'],
             "waybill"=>$info['waybill'],
-            "preparing"=>empty($info['dtime'])?"":date("Y-m-d H:i:s",$info['dtime']),//店家处理
-            "warehouse_processing"=>empty($info['printtime'])?"":date("Y-m-d H:i:s",$info['printtime']),//工厂处理
-            "shipping"=>$shipping_time,//快递发货
-            "received"=>$receive_time,//客户收货
+            "preparing"=>$preparing,//店家处理
+            "warehouse_processing"=>$warehouse_processing,//工厂处理
+            "shipping"=> $shipping,//快递发货
+            "received"=>$received,//客户收货
             "express_trace"=>$express_trace,//快递跟踪信息
         ];
         die($this->logic_tools->ret_json(1,"success",$ret_arr));