lvhao 1 месяц назад
Родитель
Сommit
a806b835d2
1 измененных файлов с 30 добавлено и 14 удалено
  1. 30 14
      core/CoreApp/controllers/Apiexpress.php

+ 30 - 14
core/CoreApp/controllers/Apiexpress.php

@@ -311,24 +311,28 @@ class Apiexpress extends Start_Controller {
                    "express_name"=>"" ,
                    "waybill"=>$order_no,
                    "preparing"=>[
-                       "desc"=>"The Order Has Been Created And TheMerchant lspreparing Your Order.",
+                       "desc"=>"The Order Has Been Created And TheMerchant ls preparing Your Order.",
                        "status"=>1,
                        "date"=>"",
+                       "title"=>"preparing order",
                    ],//店家处理
-                   "shipped"=>[
+                   "warehouse_processing"=>[
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"shipped",
                    ],//工厂处理
-                   "in_transit"=> [
+                   "shipping"=> [
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"in transit",
                    ],//快递发货
-                   "delivered"=>[
+                   "received"=>[
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"delivered",
                    ],//客户收货
                    "express_trace"=>[],//快递跟踪信息
                    "address_info"=>[
@@ -362,21 +366,25 @@ class Apiexpress extends Start_Controller {
                        "desc"=>"The Order Has Been Created And TheMerchant lspreparing Your Order.",
                        "status"=>1,
                        "date"=>"",
+                       "title"=>"preparing order",
                    ],//店家处理
-                   "shipped"=>[
+                   "warehouse_processing"=>[
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"shipped",
                    ],//工厂处理
-                   "in_transit"=> [
+                   "shipping"=> [
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"in transit",
                    ],//快递发货
-                   "delivered"=>[
+                   "received"=>[
                        "desc"=>"",
                        "status"=>0,
                        "date"=>"",
+                       "title"=>"delivered",
                    ],//客户收货
                    "express_trace"=>[],//快递跟踪信息
                    "address_info"=>[
@@ -451,29 +459,33 @@ class Apiexpress extends Start_Controller {
       
 
        if(empty($info['librarytime'])){
-           $shipped = [
+           $warehouse_processing = [
                "desc"=>"",
                "status"=>0,
                "date"=>"",
+               "title"=>"shipped",
            ];
        }else{
-           $shipped = [
+           $warehouse_processing = [
                "desc"=>"Courier company picked up the package",
                "status"=>1,
                "date"=>date("Y-m-d H:i:s",$info['librarytime']),
+               "title"=>"shipped",
            ];
        }
-       $in_transit = [
+       $shipping = [
            "desc"=>"",
            "status"=>0,
            "date"=>"",
+           "title"=>"in transit",
        ];
        //在途  没有签收 并且 出库了
        if(empty($receive_time) && $info['librarytime'] > 0){
-           $in_transit = [
+           $shipping = [
                "desc"=>"",
                "status"=>1,
                "date"=>"",
+               "title"=>"in transit",
            ];
        }
       
@@ -482,6 +494,7 @@ class Apiexpress extends Start_Controller {
                "desc"=>"",
                "status"=>0,
                "date"=>"",
+               "title"=>"delivered",
            ];
        }else{
            if($receive_time < 0){
@@ -489,12 +502,14 @@ class Apiexpress extends Start_Controller {
                    "desc"=>"Order signed for successfully",
                    "status"=>1,
                    "date"=>0,
+                   "title"=>"delivered",
                ];
            }else{
                $received = [
                    "desc"=>"Order signed for successfully",
                    "status"=>1,
                    "date"=>$receive_time,
+                   "title"=>"delivered",
                ];
            }
           
@@ -536,10 +551,11 @@ class Apiexpress extends Start_Controller {
                "desc"=>"The Order Has Been Created And TheMerchant lspreparing Your Order.",
                "status"=>1,
                "date"=>"",
+               "title"=>"preparing order",
            ],//店家处理
-           "shipped"=>$shipped,//工厂处理
-           "in_transit"=> $in_transit,//快递发货
-           "delivered"=>$received,//客户收货
+           "warehouse_processing"=>$warehouse_processing,//工厂处理
+           "shipping"=> $shipping,//快递发货
+           "received"=>$received,//客户收货
            "express_trace"=>$express_trace,//快递跟踪信息
            "address_info"=>[
                "client"=>$info['client'],//客户姓名