切换fedex到线上

core/CoreApp/controllers/Systemfout.php

@@ -931,18 +931,18 @@ class Systemfout extends Start_Controller {
 			$time = time();
 			if($express['printcode'] == "FEDEXGF")
 			{
-			   $barcode = $this->fedex->get_data($fullorder);//获取联邦快递信息
+			    //$barcode = $this->fedex->get_data($fullorder);//获取联邦快递信息
 			   //升级的api
-				//$barcode = $this->fedexv1->get_data($fullorder);//获取联邦快递信息
+				$barcode = $this->fedexv1->get_data($fullorder);//获取联邦快递信息
 			    if($barcode['x'] == 1)
 			    {
 				    $bctime = date('Ymd',$time);
 				    $Hwaybill = $barcode['waybill'];
-					$Hyd = $this->_pdf($barcode['label'],'y-'.$Hwaybill,$bctime);
-				    $Hfp = $this->_pdf($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
+					// $Hyd = $this->_pdf($barcode['label'],'y-'.$Hwaybill,$bctime);
+				    // $Hfp = $this->_pdf($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
 
-				    // $Hyd = $this->_pdfurl($barcode['label'],'y-'.$Hwaybill,$bctime);
-				    // $Hfp = $this->_pdfurl($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
+				    $Hyd = $this->_pdfurl($barcode['label'],'y-'.$Hwaybill,$bctime);
+				    $Hfp = $this->_pdfurl($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
 				    if(isset($barcode['label']) && isset($Hwaybill))
 				    {
 					    if($fullorder['waybill'] != "")

core/CoreApp/controllers/Systemprint.php

@@ -976,17 +976,17 @@ class Systemprint extends Start_Controller {
 				else if($fullorder['printcode'] == "FEDEXGF")//官方FEDEX接口
 				{
 					
-				    $barcode = $this->fedex->get_data($fullorder);//获取联邦快递信息
+				    //$barcode = $this->fedex->get_data($fullorder);//获取联邦快递信息
 				    //接口升级
-					//$barcode = $this->fedexv1->get_data($fullorder);//获取联邦快递信息
+					$barcode = $this->fedexv1->get_data($fullorder);//获取联邦快递信息
 					if($barcode['x'] == 1)
 					{
 						$bctime = date('Ymd',$time);
 						$Hwaybill = $barcode['waybill'];
-						// $Hyd = $this->_pdfurl($barcode['label'],'y-'.$Hwaybill,$bctime);
-						// $Hfp = $this->_pdfurl($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
-						$Hyd = $this->_pdf($barcode['label'],'y-'.$Hwaybill,$bctime);
-						$Hfp = $this->_pdf($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
+						$Hyd = $this->_pdfurl($barcode['label'],'y-'.$Hwaybill,$bctime);
+						$Hfp = $this->_pdfurl($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
+						// $Hyd = $this->_pdf($barcode['label'],'y-'.$Hwaybill,$bctime);
+						// $Hfp = $this->_pdf($barcode['invoice'],'f-'.$Hwaybill,$bctime);//开通ETD模式，保留PDF，不需要打印
 						if(isset($barcode['label']) && isset($Hwaybill))
 						{
 						    if($fullorder['waybill'] != "")