|
@@ -2283,6 +2283,7 @@ class Api extends Start_Controller {
|
|
{
|
|
{
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
+
|
|
if(stripos($express[$v['express']],'DHL') !== false)
|
|
if(stripos($express[$v['express']],'DHL') !== false)
|
|
{
|
|
{
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100001');
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100001');
|
|
@@ -2291,10 +2292,32 @@ class Api extends Start_Controller {
|
|
{
|
|
{
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100002');
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100002');
|
|
}
|
|
}
|
|
- else if(stripos($express[$v['express']],'FEDEX') !== false)
|
|
|
|
|
|
+ else if((stripos($express[$v['express']],'FEDEX') !== false)||(stripos($express[$v['express']],'FedEx') !== false) )
|
|
{
|
|
{
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100003');
|
|
$fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100003');
|
|
}
|
|
}
|
|
|
|
+ else if(stripos($express[$v['express']],'TNT') !== false)
|
|
|
|
+ {
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100004');
|
|
|
|
+ }
|
|
|
|
+ else if(stripos($express[$v['express']],'ARAMEX') !== false)
|
|
|
|
+ {
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100006');
|
|
|
|
+ }
|
|
|
|
+ else if(stripos($express[$v['express']],'YunExpress') !== false){
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'190008');
|
|
|
|
+ }
|
|
|
|
+ else if(stripos($express[$v['express']],'DEPX') !== false){
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'100014');
|
|
|
|
+ }
|
|
|
|
+ else if(stripos($express[$v['express']],'EMS') !== false)
|
|
|
|
+ {
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'3013');
|
|
|
|
+ }
|
|
|
|
+ else if(stripos($express[$v['express']],'GES') !== false)
|
|
|
|
+ {
|
|
|
|
+ $fsdata[] = array('number'=>$v['waybill'],'carrier'=>'190258');
|
|
|
|
+ }
|
|
else
|
|
else
|
|
{
|
|
{
|
|
$fsdata[] = array('number'=>$v['waybill'],'auto_detection'=>'true');
|
|
$fsdata[] = array('number'=>$v['waybill'],'auto_detection'=>'true');
|