【Mod】海南省内不校验配送城市

app/Http/Controllers/Api/CustomAddr.php

@@ -67,8 +67,13 @@ class CustomAddr extends Api{
 		$cityName						= $custom['city_id'] ? $City->getOne($custom['city_id'],'name') : '';
 		$pid 							= $custom['city_id'] ? $City->getOne($custom['city_id'],'pid') : 0;
 		$province						= $pid ? $City->getOne($pid,'name') : '';
-		// 判断选择的城市名称是不是一致
-		if( trim($cityName) != trim($data['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		// 如果不是海南，
+		if( $province != '海南省' )		{
+			// 判断选择的城市名称是不是一致
+			if( trim($cityName) != trim($data['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}else{
+			if( trim($data['contact_province']) != trim($province) ) return json_send(['code'=>'error','msg'=>'收货地址请选择海南范围','data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}
 		// 替换地址中间的空格
 		$data['contact_addr']			= str_ireplace(' ','',$data['contact_addr']);
 		// 最大数量
@@ -157,8 +162,13 @@ class CustomAddr extends Api{
 		$cityName						= $City->getOne($cityId,'name');
 		$pid 							= $City->getOne($cityId,'pid');
 		$province						= $City->getOne($pid,'name');
-		// 判断选择的城市名称是不是一致
-		if( trim($cityName) != trim($data['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		// 如果不是海南，
+		if( $province != '海南省' )		{
+			// 判断选择的城市名称是不是一致
+			if( trim($cityName) != trim($data['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}else{
+			if( trim($data['contact_province']) != trim($province) ) return json_send(['code'=>'error','msg'=>'收货地址请选择海南范围','data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}
 		// 替换地址中间的空格
 		$data['contact_addr']			= str_ireplace(' ','',$data['contact_addr']);
 		// 如果需要默认当前的话

app/Http/Controllers/Api/Orders.php

@@ -70,8 +70,13 @@ class Orders extends Api{
 		$cityName						= $City->getOne($cityId,'name');
 		$pid 							= $City->getOne($cityId,'pid');
 		$province						= $City->getOne($pid,'name');
-		// 判断选择的城市名称是不是一致
-		if( trim($cityName) != trim($addr['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		// 如果不是海南，
+		if( $province != '海南省' )		{
+			// 判断选择的城市名称是不是一致
+			if( trim($cityName) != trim($addr['contact_city']) ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.($province=='直辖县级'?$cityName:$province).'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}else{
+			if( trim($addr['contact_province']) != trim($province) ) return json_send(['code'=>'error','msg'=>'收货地址请选择海南范围','data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}
         // 商品购买数量
 		$buyNum							= [];
 		// 循环购买信息
@@ -663,8 +668,13 @@ class Orders extends Api{
         $cityName						= $City->getOne($cityId,'name');
         $pid 							= $City->getOne($cityId,'pid');
         $province						= $City->getOne($pid,'name');
-        // 判断选择的城市名称是不是一致
-        if( $cityName != $addr['contact_city'] ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.$province.'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		// 如果不是海南，
+		if( $province != '海南省' )		{
+			// 判断选择的城市名称是不是一致
+			if( $cityName != $addr['contact_city'] ) return json_send(['code'=>'error','msg'=>'收货地址请选择'.$province.'/'.$cityName,'data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}else{
+			if( trim($addr['contact_province']) != trim($province) ) return json_send(['code'=>'error','msg'=>'收货地址请选择海南范围','data'=>['error'=>'收货地址需与您所选城市一致']]);
+		}
         //获取团活动信息
         $regimentActiveInfo             = RegimentActive::query()
             ->where([['id','=',$regimentActiveId],['status','=',1],['start_time','<=',$time],['end_time','>=',$time]])