添加地址2的验证

core/CoreApp/models/Model_usps.php

@@ -378,7 +378,7 @@ function __construct(){
         $list['packageDescription']['destinationEntryFacilityType'] = 'NONE'; // 目的地设施类型
         $list['packageDescription']['customerReference'][0]['referenceNumber'] = $data['number']; // 客户参考
 		$list['packageDescription']['customerReference'][0]['printReferenceNumber'] = true; // 客户参考
-		//$list['packageDescription']['packageOptions']['ancillaryServiceEndorsements'] = 'ADDRESS_SERVICE_REQUESTED';
+		//$list['packageDescription']['packageOptions']['ancillaryServiceEndorsements'] = 'ADDRESS_SERVICE_REQUESTED'; //目前收费是收费项目 不需要整
         //$list['packageDescription']['carrierRelease'] = false; // 是否允许放置包裹
         //$list['packageDescription']['physicalSignatureRequired'] = true; // 是否需要实物签名
         //$list['packageDescription']['inductionZIPCode'] = ''; // 入境邮政编码
@@ -544,7 +544,11 @@ function __construct(){
 		$get['state'] = $dataprovince;
 		$get['city'] = $data['city'];
 		$get['ZIPCode'] = $data['zipcode'];
-		$get['streetAddress'] = ($data['address2']!='')?$data['address'].' '.$data['address2']:$data['address'];
+		//$get['streetAddress'] = ($data['address2']!='')?$data['address'].' '.$data['address2']:$data['address'];
+		$get['streetAddress'] = $data['address'];
+		if(!empty($data['address2'])){
+			$get['secondaryAddress'] = $data['address2'];
+		}
 		
 		$url = $url . '?' . http_build_query($get);
 		$res = $this->su_curl('',$url,$header,'json',300,"GET");