|
@@ -134,7 +134,13 @@ function __construct(){
|
|
|
if(strlen($waybill) == 30){
|
|
|
$waybill = substr($waybill, 8);
|
|
|
}
|
|
|
- $g = array('x'=>'1','waybillid'=>$res['returnDatas'][0]['corpBillid'],'waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
|
|
|
+ //FedEx-US2和USPS-US2 不需要获取转单号
|
|
|
+ if($data['printcode'] == 'FedEx_2day' || $data['printcode'] == 'usps_priority'){
|
|
|
+ $g = array('x'=>'1','waybillid'=>'','waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
|
|
|
+ }else{
|
|
|
+ $g = array('x'=>'1','waybillid'=>$res['returnDatas'][0]['corpBillid'],'waybill'=>$waybill,'yd'=>$yd);//'fp'=>$fp
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
else
|
|
|
{
|