|
@@ -2,6 +2,7 @@
|
|
|
|
|
|
namespace app\common\model;
|
|
|
|
|
|
+use think\Db;
|
|
|
use think\Model;
|
|
|
|
|
|
/**
|
|
@@ -22,20 +23,36 @@ class Eyemargin extends Model
|
|
|
->where($where)
|
|
|
->order("a.weight desc,a.createtime desc")
|
|
|
->select();
|
|
|
- if($results) foreach($results as $k => $v) {
|
|
|
- // 计算距离
|
|
|
- $results[$k]['distance'] = self::getDistance($v['lng'],$v['lat'],$user_lng,$user_lat);
|
|
|
+ if($results) {
|
|
|
+ $userinfo = Db::name('user_info');
|
|
|
+ foreach($results as $k => $v) {
|
|
|
+ // 计算距离
|
|
|
+ $results[$k]['distance'] = self::getDistance($v['lng'],$v['lat'],$user_lng,$user_lat);
|
|
|
// $results[$k]['distance_txt'] = $results[$k]['distance'] > 15 ? $v['city_name'].'·'.$v['district_name']:"距离:".$results[$k]['distance'].'km';
|
|
|
- $results[$k]['distance_txt'] = self::getDistanceTxt($v['lng'],$v['lat'],$user_lng,$user_lat,$v['city_name'],$v['district_name']);
|
|
|
- $results[$k]['right_info'] = self::getIsView($v['user_id'],$user_id);
|
|
|
- $v['cover'] || $results[$k]['cover'] = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].'/assets/img/video_cover.jpeg';
|
|
|
- $results[$k]['file_name'] = $v['eye_type'] == 1 ? self::getFileUniq($v['video']) : "";
|
|
|
- if ($v['eye_type'] == 2) {
|
|
|
- $album = explode(',', $v['album']);
|
|
|
- foreach ($album as &$vv) {
|
|
|
- $vv = $vv . config('oss.img_watermark');
|
|
|
+ $results[$k]['distance_txt'] = self::getDistanceTxt($v['lng'],$v['lat'],$user_lng,$user_lat,$v['city_name'],$v['district_name']);
|
|
|
+ $results[$k]['right_info'] = self::getIsView($v['user_id'],$user_id);
|
|
|
+ $v['cover'] || $results[$k]['cover'] = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"].'/assets/img/video_cover.jpeg';
|
|
|
+ $results[$k]['file_name'] = $v['eye_type'] == 1 ? self::getFileUniq($v['video']) : "";
|
|
|
+ if ($v['eye_type'] == 2) {
|
|
|
+ $album = explode(',', $v['album']);
|
|
|
+ foreach ($album as &$vv) {
|
|
|
+ $vv = $vv . config('oss.img_watermark');
|
|
|
+ }
|
|
|
+ $results[$k]['album'] = join('|', $album);
|
|
|
+ }
|
|
|
+ //查询在线状态和活跃状态
|
|
|
+ $user_info = $userinfo->where(['user_id' => $v['user_id']])->find();
|
|
|
+ $asktime = explode(',', $user_info['asktime']);
|
|
|
+ if ($user_info && $asktime && time() - $asktime[count($asktime) - 1] <= 3600) {
|
|
|
+ $results[$k]['is_online'] = 1; //0离线 1在线
|
|
|
+ } else {
|
|
|
+ $results[$k]['is_online'] = 0; //0离线 1在线
|
|
|
+ }
|
|
|
+ if ($user_info && count($asktime) >= 20 && $asktime[count($asktime) - 1] - $asktime[0] <= 86400) {
|
|
|
+ $results[$k]['is_active'] = 1; //活跃
|
|
|
+ } else {
|
|
|
+ $results[$k]['is_active'] = 0; //不活跃
|
|
|
}
|
|
|
- $results[$k]['album'] = join('|', $album);
|
|
|
}
|
|
|
}
|
|
|
$distance = array_column($results,'distance');
|