周六临时线上添加

core/CoreApp/controllers/Aatest.php

@@ -95,9 +95,6 @@ class Aatest extends Start_Controller {
 		$packages = $extra_text['packages'];
 		$package_id = $packages[0]['id'];
 		$shop = $this->shop->read($info['shop']);
-		var_dump($package_id);
-		var_dump($shop);
-		die;
         $this->apittv1->downloadLabel($package_id,$shop,$info);
 		die;
 

core/CoreApp/controllers/Fullorder.php

@@ -1061,12 +1061,12 @@ class Fullorder extends Start_Controller {
     			}
 			}
 			
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) )
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) )
 			{
 				echo json_encode(array('msg'=>'此快递方式必须从美仓发货！','success'=>false));exit;
 			}
 
-			if( ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5)){
+			if( ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['type'] == 5)){
 				echo json_encode(array('msg'=>'此快递方式不能美仓发货！','success'=>false));exit;
 			}
 			//仅独立站 地址美国对电话 10或者11位进行判断
@@ -1810,7 +1810,7 @@ class Fullorder extends Start_Controller {
 					$way += 1;
 				}
 			}
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['type'] == 5))
 			{
 				echo json_encode(array('msg'=>'此快递方式必须选择美仓！','success'=>false));exit;
 			}
@@ -1881,12 +1881,12 @@ class Fullorder extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'此省/州不可使用 '.$expt['servicename'],'success'=>false));exit;
 			}
-			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
 			}

core/CoreApp/controllers/Fullorderamz.php

@@ -1021,7 +1021,7 @@ class Fullorderamz extends Start_Controller {
     				}	
     			}
 			}
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81  && $post['type'] == 5))
 			{
 				echo json_encode(array('msg'=>'此快递方式不可从美仓发货！','success'=>false));exit;
 			}
@@ -1689,7 +1689,7 @@ class Fullorderamz extends Start_Controller {
 					$way += 1;
 				}
 			}
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['type'] == 5))
 			{
 				echo json_encode(array('msg'=>'此快递方式必须选择美仓！','success'=>false));exit;
 			}
@@ -1701,12 +1701,12 @@ class Fullorderamz extends Start_Controller {
 			{
 				echo json_encode(array('msg'=>'特殊仓必须包含特殊仓货物！','success'=>false));exit;
 			}
-			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
 			}

core/CoreApp/controllers/Fullordersmt.php

@@ -860,7 +860,7 @@ class Fullordersmt extends Start_Controller {
     				}	
     			}
 			}
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['type'] == 5))
 			{
 				echo json_encode(array('msg'=>'此快递方式不可从美仓发货！','success'=>false));exit;
 			}
@@ -1417,12 +1417,12 @@ class Fullordersmt extends Start_Controller {
 			    }
 
 
-			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
 			}

core/CoreApp/controllers/Fullordertt.php

@@ -1026,7 +1026,7 @@ class Fullordertt extends Start_Controller {
     				}	
     			}
 			}
-			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['type'] == 5))
+			if((($post['express'] == 2 || $post['express'] == 63 || $post['express'] == 64 || $post['express'] == 81) && $post['type'] != 5) || ($post['express'] != 2 && $post['express'] != 63 && $post['express'] != 64 && $post['express'] != 81 && $post['type'] == 5))
 			{
 				echo json_encode(array('msg'=>'此快递方式不可从美仓发货！','success'=>false));exit;
 			}
@@ -1741,12 +1741,12 @@ class Fullordertt extends Start_Controller {
 				echo json_encode(array('msg'=>'非英国无法选择CNE和GES！','success'=>false));exit;
 			}
 
-			if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+			if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式必须从美仓发货！",'success'=>false));exit;
 			}
 	
-			if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+			if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
 			{
 				echo json_encode(array('msg'=>"此快递方式不能美仓发货！",'success'=>false));exit;
 			}

core/CoreApp/controllers/Systemfout.php

@@ -723,7 +723,7 @@ class Systemfout extends Start_Controller {
             
         	
         	//$this->logic_ding->sendToDing("检测订单".$y['number']."称重".$numweight."快递公司".$y['express']."-".$weight."[".$numweight."]");
-			if(!in_array($y['express'],[2,8,39,43,44,45,47,48,49,55,61,63,64,65,74])){
+			if(!in_array($y['express'],[2,8,39,43,44,45,47,48,49,55,61,63,64,65,74,81])){
 				if($weight == '' || $numweight < '0.1' || !is_numeric($numweight))
 				{
 					echo json_encode(array('msg'=>'此单需要称重！','success'=>false));exit;

core/CoreApp/models/Model_hualei.php

@@ -169,6 +169,11 @@ function __construct(){
 				'duty_type'=>$duty_type,
 			);
 		}
+		if($data['printcode'] == 'HUALEI-UNI'){
+		    if($data['printnumber'] > 0){
+		        $count['order_customerinvoicecode'] = $data['number']."-".$data['printnumber'];
+		    }
+		}
 // 		var_dump($link);
 // 		var_dump(json_encode($count));
 		$this->logic_ding->sendToDing("hualei发货单请求的报文".$link.json_encode($count));

core/CoreApp/models/Model_logic_order.php

@@ -294,7 +294,7 @@ class Model_logic_order extends Lin_Model {
             
            
         }
-        if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+        if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
         {
             return [
                 'code'=>-1,
@@ -302,7 +302,7 @@ class Model_logic_order extends Lin_Model {
             ];
         }
 
-        if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
         {
             return [
                 'code'=>-1,
@@ -311,7 +311,7 @@ class Model_logic_order extends Lin_Model {
         }
         
         //云尚  3pe  fedex  usps 必须收件国家位美国
-        if(in_array($post['express'],[2,24,31,63,64,71,75,76,77])){
+        if(in_array($post['express'],[2,24,31,63,64,71,75,76,77,81])){
             if($post['country'] != 192 ){
                 return [
                     'code'=>-1,
@@ -489,7 +489,7 @@ class Model_logic_order extends Lin_Model {
            
         }
 
-        if($post['type'] != 5 && in_array($post['express'],[2,63,64]))
+        if($post['type'] != 5 && in_array($post['express'],[2,63,64,81]))
         {
             return [
                 'code'=>-1,
@@ -497,7 +497,7 @@ class Model_logic_order extends Lin_Model {
             ];
         }
 
-        if($post['type'] == 5 && !in_array($post['express'],[2,63,64]))
+        if($post['type'] == 5 && !in_array($post['express'],[2,63,64,81]))
         {
             return [
                 'code'=>-1,
@@ -513,7 +513,7 @@ class Model_logic_order extends Lin_Model {
         //     }
         // }
          //云尚  3pe  fedex  usps 必须收件国家位美国
-         if(in_array($post['express'],[2,24,31,63,64,71,75,76,77])){
+         if(in_array($post['express'],[2,24,31,63,64,71,75,76,77,81])){
             if($post['country'] != 192 ){
                 return [
                     'code'=>-1,

core/CoreApp/models/Model_logic_u9mgwx.php

@@ -117,6 +117,9 @@ class Model_logic_u9mgwx extends Lin_Model {
          if(empty($res[0]['Data'])){
             return ;
         }
+        echo "<pre>";
+        print_r($res);
+        die;
         // 审核了 
         $list = $res[0]['Data'];