|
@@ -89,12 +89,21 @@ class Apiexpress extends Start_Controller {
|
|
$tmp_arr = explode("<br />",$info['excontent']);
|
|
$tmp_arr = explode("<br />",$info['excontent']);
|
|
array_pop($tmp_arr);
|
|
array_pop($tmp_arr);
|
|
$re_arr = array_reverse($tmp_arr);
|
|
$re_arr = array_reverse($tmp_arr);
|
|
- $shipping_time_arr = explode("[",$re_arr[0] ) ;
|
|
|
|
- $shipping_time = $shipping_time_arr[0];
|
|
|
|
- if($info['expressstate'] == 6){
|
|
|
|
- $receive_tmp_arr = explode("[",$tmp_arr[0] ) ;
|
|
|
|
- $receive_time = $receive_tmp_arr[0];
|
|
|
|
|
|
+ if(strpos($re_arr[0],"[") !== false){
|
|
|
|
+ $shipping_time_arr = explode("[",$re_arr[0] ) ;
|
|
|
|
+ $shipping_time = $shipping_time_arr[0];
|
|
|
|
+ if($info['expressstate'] == 6){
|
|
|
|
+ $receive_tmp_arr = explode("[",$tmp_arr[0] ) ;
|
|
|
|
+ $receive_time = $receive_tmp_arr[0];
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ $shipping_time = date("Y-m-d H:i:s",$info['dlzemailtime']);
|
|
|
|
+ if($info['expressstate'] == 6){
|
|
|
|
+
|
|
|
|
+ $receive_time = -1;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
$express_trace = $re_arr;
|
|
$express_trace = $re_arr;
|
|
}
|
|
}
|
|
if(empty($info['dtime'])){
|
|
if(empty($info['dtime'])){
|
|
@@ -145,11 +154,20 @@ class Apiexpress extends Start_Controller {
|
|
"date"=>"",
|
|
"date"=>"",
|
|
];
|
|
];
|
|
}else{
|
|
}else{
|
|
- $received = [
|
|
|
|
- "desc"=>"Order signed for successfully",
|
|
|
|
- "status"=>1,
|
|
|
|
- "date"=>$receive_time,
|
|
|
|
- ];
|
|
|
|
|
|
+ if($receive_time < 0){
|
|
|
|
+ $received = [
|
|
|
|
+ "desc"=>"Order signed for successfully",
|
|
|
|
+ "status"=>1,
|
|
|
|
+ "date"=>0,
|
|
|
|
+ ];
|
|
|
|
+ }else{
|
|
|
|
+ $received = [
|
|
|
|
+ "desc"=>"Order signed for successfully",
|
|
|
|
+ "status"=>1,
|
|
|
|
+ "date"=>$receive_time,
|
|
|
|
+ ];
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -167,4 +185,6 @@ class Apiexpress extends Start_Controller {
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|