diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php index 495526ce..f10df83f 100644 --- a/application/api/controller/Room.php +++ b/application/api/controller/Room.php @@ -113,7 +113,7 @@ class Room extends BaseCom $end_time = input('end_time', ''); $page = input('page', 1); $page_limit = input('page_limit', 15); - $reslut = model('Room')->room_turnover_detail($room_id, $start_time, $end_time, $page, $page_limit); + $reslut = model('Room')->room_turnover_detail($this->uid, $room_id, $start_time, $end_time, $page, $page_limit); return V($reslut['code'], $reslut['msg'], $reslut['data']); } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index c00e860e..6731e63b 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -481,7 +481,22 @@ class Room extends Model * 房间流水明细 * 按天统计指定房间流水 */ - public function room_turnover_detail($room_id,$stime,$etime,$page,$page_limit) { + public function room_turnover_detail($userId,$room_id,$stime,$etime,$page,$page_limit) { + //查看用户和房间的关系 + $isOwner = 0; + $isHost = 0; + $owner = db::name('vs_room')->where(['id' => $room_id])->value('user_id'); + if($owner != $userId){ + $host = db::name('vs_room_host')->where(['room_id' => $room_id ,'user_id' => $userId,'type' => 1,'deletetime' => null])->find(); + if(!$host){ + return ['code' => 1, 'msg' => '成功', 'data' => ['total_amount' => 0, 'total_earning' => 0,'list' => null]]; + }else{ + $isHost = 1; + } + }else{ + $isOwner = 1; + } + //如果没有传参数默认查询本月 $stime = empty($stime) ? date('Y-m-01') : $stime; $etime = empty($etime) ? date('Y-m-d') : $etime; @@ -514,7 +529,10 @@ class Room extends Model $value['receive_avatar'] = db::name('user')->where('id', $value['gift_user'])->value('avatar'); $value['gift_name'] = db::name('vs_gift')->where('gid', $value['gift_id'])->value('gift_name'); //收益计算 - $value['earning'] = round($value['total_price'] * $room_user_ratio / get_system_config_value('rmb_coin_ratio'), 4); + if($isOwner){ + $value['earning'] = round($value['total_price'] * $room_user_ratio / get_system_config_value('rmb_coin_ratio'), 4); + } + $value['earning'] = 0; //按日期统计 $list_data[$value['time']][] = $value; } @@ -525,10 +543,12 @@ class Room extends Model $list_data_array[$i]['time'] = $k; $list_data_array[$i]['list'] = $v; //每日流水统计 - $day_total_price = model('api/RoomDailyIncome')->getTodayIncome($room_id, $k); - $list_data_array[$i]['total_price'] = $day_total_price ; - //每日收益 - $list_data_array[$i]['total_earning'] = round($day_total_price * $room_user_ratio / get_system_config_value('rmb_coin_ratio'), 4); + if($isOwner) { + $day_total_price = model('api/RoomDailyIncome')->getTodayIncome($room_id, $k); + $list_data_array[$i]['total_price'] = $day_total_price; + //每日收益 + $list_data_array[$i]['total_earning'] = round($day_total_price * $room_user_ratio / get_system_config_value('rmb_coin_ratio'), 4); + } $i++; } @@ -538,7 +558,14 @@ class Room extends Model //房主总收益 $coin_exchange_rate = get_system_config_value('coin_exchange_rate') ?? 1; - $total_earning = round($total_amount * $room_user_ratio / $coin_exchange_rate, 4); + if($isOwner) { + $total_earning = round($total_amount * $room_user_ratio / $coin_exchange_rate, 4); + }else{ + $total_earning = db::name('user_earnings_log') + ->where(['user_id' => $userId,'room_id' => $room_id,'change_type' => 19]) + ->where('createtime', 'between', [strtotime($stime), strtotime($etime)]) + ->sum('earnings'); + } return ['code' => 1, 'msg' => '成功', 'data' => ['total_amount' => $total_amount, 'total_earning' => $total_earning,'list' => $list_data_array]]; } diff --git a/application/api/model/User.php b/application/api/model/User.php index 25709b11..d2a95046 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -849,6 +849,7 @@ class User extends Model } } db::commit(); + Cache::rm('user_base_info_'.$user_id); //推送信息去所在房间 //查询当前所在房间 $room_id = db::name('vs_room_visitor')->where(['user_id' => $user_id])->order('id' , 'desc')->value('room_id'); @@ -868,7 +869,7 @@ class User extends Model $member_name = db::name('user')->where('id' , $user_id)->value('nickname'); $member_face_url = db::name('user')->where('id' , $user_id)->value('avatar'); model('Tencent')->modify_user_infos($user_id, $member_name, $member_face_url); - Cache::rm('user_base_info_'.$user_id); + return ['code' => 1, 'msg' => '修改成功', 'data' => null]; } catch(\Exception $e){ diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php index 338d913f..f83e8a42 100644 --- a/application/api/model/UserData.php +++ b/application/api/model/UserData.php @@ -91,13 +91,13 @@ class UserData extends Model $reslut = model('User')->update($data); if ($reslut) { + $cache_key = 'user_base_info_'.$uid; + Cache::rm($cache_key); $user_info = model('User')->where('id', $uid)->field('id,nickname,avatar,user_code')->find(); //给腾讯同步用户信息 $member_name = $user_info['nickname']; $member_face_url = $user_info['avatar']; model('Tencent')->modify_user_infos($uid, $member_name, $member_face_url); - $cache_key = 'user_base_info_'.$uid; - Cache::rm($cache_key); return ['code' => 1, 'msg' => '修改成功', 'data' => $user_info]; } else { return ['code' => 0, 'msg' => '修改失败,','data' =>null]; @@ -415,6 +415,7 @@ class UserData extends Model } //任务:3-实名认证 model('Tasks')->tasks_complete($user_id,3); + Cache::rm('user_base_info_'.$user_id); return ['code' => 1, 'msg' => '实名成功','data' =>null]; }