lvhao 3 napja
szülő
commit
dfc9f7bc97
1 módosított fájl, 24 hozzáadás és 4 törlés
  1. 24 4
      core/CoreApp/controllers/Fullorderamz.php

+ 24 - 4
core/CoreApp/controllers/Fullorderamz.php

@@ -4603,21 +4603,41 @@ class Fullorderamz extends Start_Controller {
 				echo json_encode(array('msg'=>'请求失败,已有Return Label信息!','success'=>false));exit;
 			}
 			$barcode = $this->usps->get_return($data);
+
+
 			if(isset($barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription']))
 			{
 				echo json_encode(array('msg'=>$barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription'],'success'=>false));exit;
 			}
-			else if(isset($barcode['TrackingNumber']))
+			else if(isset($barcode['trackingNumber']))
 			{
-				$pdf = $this->_pdf($barcode['ReturnLabel'],'t-'.$barcode['TrackingNumber'],$bctime);
-				$read = 'PostalRouting:'.$barcode['PostalRouting'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['TrackingNumber'].'.pdf" target="_blank">'.$barcode['TrackingNumber'].'</a>';
+				$pdf = $this->_pdf($barcode['returnLabelImage'],'t-'.$barcode['trackingNumber'],$bctime);
+				$read = 'PostalRouting:'.$barcode['routingInformation'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['trackingNumber'].'.pdf" target="_blank">'.$barcode['trackingNumber'].'</a>';
 				$this->$fu->save(array('returndata'=>$read),$data['id']);
 			 	echo json_encode(array('msg'=>'生成Return Label成功!','data'=>$read,'success'=>true));exit;
 			}
 			else
 			{
-				echo json_encode(array('msg'=>'请求失败,请稍后重试!','cs'=>$barcode,'success'=>false));exit;
+				echo json_encode(array('msg'=>'请求失败,请稍后重试!'.json_encode($barcode),'cs'=>$barcode,'success'=>false));exit;
 			}
+
+
+
+			// if(isset($barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription']))
+			// {
+			// 	echo json_encode(array('msg'=>$barcode['errors']['ExternalReturnLabelError']['InternalErrorDescription'],'success'=>false));exit;
+			// }
+			// else if(isset($barcode['TrackingNumber']))
+			// {
+			// 	$pdf = $this->_pdf($barcode['ReturnLabel'],'t-'.$barcode['TrackingNumber'],$bctime);
+			// 	$read = 'PostalRouting:'.$barcode['PostalRouting'].' - TrackingNumber:<a href="/data/pdf/'.$bctime.'/'.'t-'.$barcode['TrackingNumber'].'.pdf" target="_blank">'.$barcode['TrackingNumber'].'</a>';
+			// 	$this->$fu->save(array('returndata'=>$read),$data['id']);
+			//  	echo json_encode(array('msg'=>'生成Return Label成功!','data'=>$read,'success'=>true));exit;
+			// }
+			// else
+			// {
+			// 	echo json_encode(array('msg'=>'请求失败,请稍后重试!','cs'=>$barcode,'success'=>false));exit;
+			// }
 		}
 	}
 	public function _pdf($pdf,$title,$bctime)