提交修改tt-shipping划分为usps和fedex

core/CoreApp/controllers/Systemprint.php

@@ -1764,12 +1764,12 @@ class Systemprint extends Start_Controller {
 						$failed = $barcode['Description'];//错误提示
 						$this->$fullorder_name->save(array('print'=>1,'failed'=>$failed),$va[$n]);
 					}
-				}elseif(($fullorder['printcode'] == "TTUK") || ($fullorder['printcode'] == "TTUS") || ($fullorder['printcode'] == "TTSP")){
+				}elseif(($fullorder['printcode'] == "TTUK") || ($fullorder['printcode'] == "TTUS") || ($fullorder['printcode'] == "TTSP")|| ($fullorder['printcode'] == "TTSP-Fedex")){
 					$pdf_width_model = 85;
 					if($fullorder['printcode'] == "TTUK"){
 						$barcode = $this->express_tt->get_data($fullorder,"FBT");
 						$this->logic_ding->sendToDing("TTUK获取快递面单".json_encode($barcode));
-					}elseif($fullorder['printcode'] == "TTUS" || $fullorder['printcode'] == "TTSP"){
+					}elseif($fullorder['printcode'] == "TTUS" || $fullorder['printcode'] == "TTSP" || $fullorder['printcode'] == "TTSP-Fedex"){
 						$barcode = $this->express_tt->get_data($fullorder,"CBT");
 						$this->logic_ding->sendToDing("CBT获取快递面单".json_encode($barcode));
 						$pdf_width_model = 90;

core/CoreApp/models/Model_logic_express.php

@@ -61,8 +61,8 @@ class Model_logic_express extends Lin_Model {
             //TT-UK
             return $this->check_ttuk($waybill);
         }
-        else if(in_array($express_code,[7,14,35,59,83,85])){
-            //ges  顺丰 燕文 中通  tt-cbt  tt-shipping
+        else if(in_array($express_code,[7,14,35,59,83,85,87])){
+            //ges  顺丰 燕文 中通  tt-cbt  tt-shipping-usps tt-shipping-fedex
             return true;
         }
         return false;
@@ -118,7 +118,7 @@ class Model_logic_express extends Lin_Model {
         else if(in_array($print_code,["TTUK"])){
             //TT-UK
             return $this->check_ttuk($waybill);
-        }else if(in_array($print_code,['GES','YANWEN',"TTUS","TTSP","SF","ZhongTong"])){
+        }else if(in_array($print_code,['GES','YANWEN',"TTUS","TTSP",'TTSP-Fedex',"SF","ZhongTong"])){
              //ges  顺丰 燕文 中通  tt-cbt  tt-shipping
             return true;
         }