提交测试

core/CoreApp/models/Model_logic_express.php

@@ -18,7 +18,7 @@ class Model_logic_express extends Lin_Model {
             //云途(美国) 云途欧盟  云途欧盟-带保险
             return $this->check_yt($waybill);
         }else if(in_array($express_code,[71,75,31,63,50])){
-            //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2
+            //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2  惠城联邦
             return $this->check_fedex($waybill);
         }else if(in_array($express_code,[1,69])){
             //dhl
@@ -29,10 +29,12 @@ class Model_logic_express extends Lin_Model {
         }else if(in_array($express_code,[81])){
             //uniuni
             return $this->check_uniuni($waybill);
-        }else if(in_array($express_code,[7])){
-            //ges
-            return $this->check_ges($waybill);
-        }else if(in_array($express_code,[78,79,84])){
+        }
+        // else if(in_array($express_code,[7])){
+        //     //ges
+        //     return $this->check_ges($waybill);
+        // }
+        else if(in_array($express_code,[78,79,84])){
             //正鑫dpd 英国|欧洲  维库dpd
             return $this->check_dpd($waybill);
         }else if(in_array($express_code,[52])){
@@ -43,21 +45,24 @@ class Model_logic_express extends Lin_Model {
             return $this->check_hc_usps($waybill);
         }else if(in_array($express_code,[51])){
             //惠城ges
-            return $this->check_hc_ges($waybill);
-        }else if(in_array($express_code,[35])){
-            //燕文
-            return $this->check_yw($waybill);
-        }else if(in_array($express_code,[14])){
-            //顺丰
-            return $this->check_sf($waybill);
-        }else if(in_array($express_code,[59])){
-            //中通
-            return $this->check_zt($waybill);
-        }else if(in_array($express_code,[80])){
+            return $this->check_ges($waybill);
+        }
+        // else if(in_array($express_code,[35])){
+        //     //燕文
+        //     return $this->check_yw($waybill);
+        // }else if(in_array($express_code,[14])){
+        //     //顺丰
+        //     return $this->check_sf($waybill);
+        // }else if(in_array($express_code,[59])){
+        //     //中通
+        //     return $this->check_zt($waybill);
+        // }
+        else if(in_array($express_code,[80])){
             //TT-UK
             return $this->check_ttuk($waybill);
-        }else if(in_array($express_code,[83,85])){
-            //
+        }
+        else if(in_array($express_code,[7,14,35,59,83,85])){
+            //ges  顺丰 燕文 中通  tt-cbt  tt-shipping
             return true;
         }
         return false;
@@ -70,7 +75,7 @@ class Model_logic_express extends Lin_Model {
             //云途(美国) 云途欧盟  云途欧盟-带保险
             return $this->check_yt($waybill);
         }else if(in_array($print_code,['FedEx_GD','FEDEX_G','FEDEXGF','FedEx_2day','HUALEI-FEDEX'])){
-            //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2
+            //云尚快递快线和普货 fedex   fedex(杭州)-不报关 FedEx-US2  惠城联邦
             return $this->check_fedex($waybill);
         }else if(in_array($print_code,['DHL','HUALEI-DHL'])){
             //dhl
@@ -81,10 +86,13 @@ class Model_logic_express extends Lin_Model {
         }else if(in_array($print_code,['HUALEI-UNI'])){
             //uniuni
             return $this->check_uniuni($waybill);
-        }else if(in_array($print_code,['GES'])){
-            //ges
-            return $this->check_ges($waybill);
-        }else if(in_array($print_code,['ZXDPD_UK','ZXDPD_BTC','3PE_EU_DPD'])){
+        }
+        // else if(in_array($print_code,['GES'])){
+        //     //ges
+        //     return $this->check_ges($waybill);
+        
+        // }
+        else if(in_array($print_code,['ZXDPD_UK','ZXDPD_BTC','3PE_EU_DPD'])){
             //正鑫dpd 英国|欧洲  维库dpd
             return $this->check_dpd($waybill);
         }else if(in_array($print_code,['HUALEI-ARAMEX-G'])){
@@ -95,20 +103,23 @@ class Model_logic_express extends Lin_Model {
             return $this->check_hc_usps($waybill);
         }else if(in_array($print_code,['HUALEI-GES-EU'])){
             //惠城ges
-            return $this->check_hc_ges($waybill);
-        }else if(in_array($print_code,['YANWEN'])){
-            //燕文
-            return $this->check_yw($waybill);
-        }else if(in_array($print_code,["SF"])){
-            //顺丰
-            return $this->check_sf($waybill);
-        }else if(in_array($print_code,["ZhongTong"])){
-            //中通
-            return $this->check_zt($waybill);
-        }else if(in_array($print_code,["TTUK"])){
+            return $this->check_ges($waybill);
+        }
+        // else if(in_array($print_code,['YANWEN'])){
+        //     //燕文
+        //     return $this->check_yw($waybill);
+        // }else if(in_array($print_code,["SF"])){
+        //     //顺丰
+        //     return $this->check_sf($waybill);
+        // }else if(in_array($print_code,["ZhongTong"])){
+        //     //中通
+        //     return $this->check_zt($waybill);
+        // }
+        else if(in_array($print_code,["TTUK"])){
             //TT-UK
             return $this->check_ttuk($waybill);
-        }else if(in_array($print_code,["TTUS","TTSP"])){
+        }else if(in_array($print_code,['GES','YANWEN',"TTUS","TTSP","SF","ZhongTong"])){
+             //ges  顺丰 燕文 中通  tt-cbt  tt-shipping
             return true;
         }
         return false;
@@ -171,7 +182,7 @@ class Model_logic_express extends Lin_Model {
         if(strlen($waybill) != 17){
             return false;
         }
-        if(strpos($waybill, "ZCEHC") === false){
+        if(strpos($waybill, "YQ") === false){
             return false;
         }
         return true;