提交云尚的国内渠道

core/CoreApp/controllers/Systemprint.php

@@ -57,6 +57,7 @@ class Systemprint extends Start_Controller {
 		$this->load->_model("Model_itsxb","itsxb");
 		$this->load->_model("Model_express_tt","express_tt");
 		$this->load->_model("Model_logic_u9tools","logic_u9tools");
+		$this->load->_model("Model_cnev1","cnev1");
 		//$this->load->_model("Model_waybilldowns","waybilldowns");
 	}
 	//定义方法的调用规则 获取URI第二段值
@@ -1397,7 +1398,7 @@ class Systemprint extends Start_Controller {
 						$this->$fullorder_name->save(array('print'=>1,'failed'=>$failed),$va[$n]);
 					}
 				}
-				else if($fullorder['printcode'] == "DPEX" || $fullorder['printcode'] == "FedEx_2day" || $fullorder['printcode'] == "usps_priority" || $fullorder['printcode'] == 'FEDEX_G' || $fullorder['printcode'] == 'FedEx_GD')//官方FEDEX接口
+				else if($fullorder['printcode'] == "DPEX" || $fullorder['printcode'] == "FedEx_2day" || $fullorder['printcode'] == "usps_priority" )//官方FEDEX接口
 				{
 					if($fullorder['waybillid'] != '')
 					{
@@ -1406,33 +1407,33 @@ class Systemprint extends Start_Controller {
 				    $barcode = $this->cne->get_data($fullorder);
 					if($barcode['x'] == 1)
 					{
-						if($fullorder['printcode'] == 'FedEx_GD'){
+						// if($fullorder['printcode'] == 'FedEx_GD'){
 
-							$bctime = date('Ymd',$time);
-							$Hwaybill = $barcode['waybill'];
+						// 	$bctime = date('Ymd',$time);
+						// 	$Hwaybill = $barcode['waybill'];
 						
-							//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
-							if(isset($barcode['yd']) && isset($Hwaybill))
-							{
-								if($fullorder['waybill'] != "")
-								{
-									$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
-								}
-								else
-								{
-									$oldwaybill = $fullorder['oldwaybill'];
-								}
-								$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
-								$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
-								if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
-								{
-									$type = 2;
-									$pdfnum = ($fullorder['printcode'] == "DPEX")?2:1;
-									$text = array('yd'=>'wu','mode'=>100);
-								}
-							}
+						// 	//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
+						// 	if(isset($barcode['yd']) && isset($Hwaybill))
+						// 	{
+						// 		if($fullorder['waybill'] != "")
+						// 		{
+						// 			$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
+						// 		}
+						// 		else
+						// 		{
+						// 			$oldwaybill = $fullorder['oldwaybill'];
+						// 		}
+						// 		$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
+						// 		$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
+						// 		if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
+						// 		{
+						// 			$type = 2;
+						// 			$pdfnum = ($fullorder['printcode'] == "DPEX")?2:1;
+						// 			$text = array('yd'=>'wu','mode'=>100);
+						// 		}
+						// 	}
 
-						}else{
+						// }else{
 
 							$bctime = date('Ymd',$time);
 							$Hwaybill = $barcode['waybill'];
@@ -1458,8 +1459,55 @@ class Systemprint extends Start_Controller {
 								}
 							}
 
+						//}
+						
+					}
+					else
+					{
+						//云尚比较特殊 有时间请求500 也会在对方系统中
+						//$fullorder['printnumber'] = $fullorder['printnumber'] +1;
+						if(empty($barcode['Description'])){
+							$this->logic_ding->sendToDing("云尚打印返回错误未保存【".$fullorder['number']."】".json_encode($barcode));
+							$failed = "API接口异常,订单打印失败";//错误提示
+						}else{
+							$failed = $barcode['Description'];//错误提示
 						}
 						
+						//$this->$fullorder_name->save(array('print'=>1,'failed'=>$failed,'printnumber'=>$fullorder['printnumber']),$va[$n]);
+						$this->$fullorder_name->save(array('print'=>1,'failed'=>$failed),$va[$n]);
+					}
+				}elseif($fullorder['printcode'] == 'FEDEX_G' || $fullorder['printcode'] == 'FedEx_GD'){
+					if($fullorder['waybillid'] != '')
+					{
+						 $del = $this->cnev1->cancel_yd($fullorder['waybill']);
+					}
+				    $barcode = $this->cnev1->get_data($fullorder);
+					if($barcode['x'] == 1)
+					{
+
+						$bctime = date('Ymd',$time);
+						$Hwaybill = $barcode['waybill'];
+						$Hyd = $this->_pdfurl($barcode['yd'],'y-'.$Hwaybill,$bctime);
+						//$Hfp = $this->_pdfurl($barcode['fp'],'f-'.$Hwaybill,$bctime);//保留PDF，不需要打印
+						if(isset($barcode['yd']) && isset($Hwaybill))
+						{
+							if($fullorder['waybill'] != "")
+							{
+								$oldwaybill = $fullorder['oldwaybill'].'-'.date('Ymd',$time).'/'.$fullorder['waybill'];
+							}
+							else
+							{
+								$oldwaybill = $fullorder['oldwaybill'];
+							}
+							$oldwaybill .= '-'.$bctime.'/'.$Hwaybill;
+							$fullorder['printnumber'] = $fullorder['printnumber'] +1;//不能删
+							if($this->$fullorder_name->save(array('waybill'=>$Hwaybill,'waybillid'=>$barcode['waybillid'],'libraryconfirm'=>2,'librarynot'=>'','printtime'=>$time,'printnumber'=>$fullorder['printnumber'],'print'=>3,'oldwaybill'=>$oldwaybill,'oldprinttime'=>$oldprinttime),$va[$n]))
+							{
+								$type = 1;
+								$text = array('yd'=>base_url().'data/pdf/'.$bctime.'/y-'.$Hwaybill.'.pdf','mode'=>100);
+							}
+						}
+
 					}
 					else
 					{

core/CoreApp/models/Model_logic_express.php

@@ -17,9 +17,12 @@ class Model_logic_express extends Lin_Model {
         }else if(in_array($express_code,[82,66,67])){
             //云途(美国) 云途欧盟  云途欧盟-带保险
             return $this->check_yt($waybill);
-        }else if(in_array($express_code,[71,75,31,63,50,24,93])){
+        }else if(in_array($express_code,[31,63,50,24,93])){
             //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2  惠城联邦
             return $this->check_fedex($waybill);
+        }else if(in_array($express_code,[71,75])){
+            //云尚快递快线和普货 fedex 
+            return $this->check_ys($waybill);
         }else if(in_array($express_code,[1,69,90])){
             //dhl
             return $this->check_dhl($waybill);
@@ -77,10 +80,14 @@ class Model_logic_express extends Lin_Model {
         }else if(in_array($print_code,['YunExpress_JFPHTKR','YunExpress','YunExpress_BaoXian'])){
             //云途(美国) 云途欧盟  云途欧盟-带保险
             return $this->check_yt($waybill);
-        }else if(in_array($print_code,['FedEx_GD','FEDEX_G','FEDEXGF','FedEx_2day','HUALEI-FEDEX','HUALEI-FEDEX-9610','HUALEI-FEDEX-BBG'])){
+        }else if(in_array($print_code,['FEDEXGF','FedEx_2day','HUALEI-FEDEX','HUALEI-FEDEX-9610','HUALEI-FEDEX-BBG'])){
             //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2  惠城联邦
             return $this->check_fedex($waybill);
-        }else if(in_array($print_code,['DHL','HUALEI-DHL','DHL-9'])){
+        }else if(in_array($print_code,['FedEx_GD','FEDEX_G'])){
+            //云尚快递快线和普货 
+            return $this->check_ys($waybill);
+        }
+        else if(in_array($print_code,['DHL','HUALEI-DHL','DHL-9'])){
             //dhl
             return $this->check_dhl($waybill);
         }else if(in_array($print_code,['USPS','usps_priority'])){
@@ -138,10 +145,19 @@ class Model_logic_express extends Lin_Model {
         }
         return true;
     }
-
+    // 71,75
+    protected function check_ys($waybill){
+        if(strpos($waybill, "YS") === false){
+            return false;
+        }
+        if(strlen($waybill) != 12){
+            return false;
+        }
+        return true;
+    }
     //云途快递
     protected function check_yt($waybill){
-        if(strlen($waybill) != 18){
+         if(strlen($waybill) != 18){
             return false;
          }
          if(strpos($waybill, "YT") === false){