|
@@ -436,6 +436,7 @@ class Usercenter extends Api
|
|
|
return $lists;
|
|
|
}
|
|
|
//dump($lists);
|
|
|
+
|
|
|
//过滤掉通话中的
|
|
|
foreach($lists as $key => $val){
|
|
|
if(redis_get($val['id']) == 1){
|
|
@@ -446,6 +447,7 @@ class Usercenter extends Api
|
|
|
//预留全部
|
|
|
$all_result = array_column($lists,'id');
|
|
|
//dump($all_result);
|
|
|
+
|
|
|
//提取同城的
|
|
|
$citydata = [];
|
|
|
foreach($lists as $key => $val){
|
|
@@ -469,16 +471,13 @@ class Usercenter extends Api
|
|
|
}
|
|
|
//dump($tagdata);
|
|
|
|
|
|
- //两个都满足
|
|
|
+ //双条件都满足
|
|
|
$double_data = [];
|
|
|
if(!empty($citydata) && !empty($tagdata)){
|
|
|
$double_data = array_intersect($citydata,$tagdata);
|
|
|
}
|
|
|
//dump($double_data);
|
|
|
-
|
|
|
- //双条件数量足够就return
|
|
|
if(count($double_data) >= 1){
|
|
|
- //echo __LINE__;
|
|
|
return $double_data;
|
|
|
}
|
|
|
|
|
@@ -487,7 +486,6 @@ class Usercenter extends Api
|
|
|
$merge_data = array_flip(array_flip($merge_data));
|
|
|
//dump($merge_data);
|
|
|
if(count($merge_data) >= 1){
|
|
|
- //echo __LINE__;
|
|
|
return $merge_data;
|
|
|
}
|
|
|
|