diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index caa6640..c9ed6f2 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -376,57 +376,6 @@ class Decorate extends Model * @param $id 对象id * @param $type 装扮类型 1头像框 2坐骑 3麦圈 6个人靓号 7房间靓号 8公会靓号 */ -// public function user_decorate_detail($id, $type){ -// //根据$type 组装查询条件 -// $reslut = ""; -// if($type == 7){//7房间靓号 8工会靓号 -// $room = db::name('vs_room')->where('id', $id)->field('user_id,room_number')->find(); -// if(empty($room)){ -// return $reslut; -// } -// $map = [ -// 'user_id' => $room['user_id']??0, -// 'type' => $type, -// 'is_using' => 1 -// ]; -// $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $room['room_number']; -// }elseif($type == 8){ -// $guild = db::name('vs_guild')->where('id', $id)->field('user_id,guild_special_id')->find(); -// $map = [ -// 'user_id' => $guild['user_id']??0, -// 'type' => $type, -// 'is_using' => 1 -// ]; -// $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $guild['guild_special_id']; -// }elseif($type == 6){ -// $map = [ -// 'user_id' => $id??0, -// 'type' => $type, -// 'is_using' => 1 -// ]; -// $user_code = db::name('user')->where('id', $id)->value('user_code'); -// $reslut = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('special_num') ?? $user_code; -// }else{ -// $map = [ -// 'user_id' => $id??0, -// 'type' => $type, -// 'is_using' => 1 -// ]; -// $did = db::name('vs_user_decorate')->where($map)->where('end_time',['>=',time()],'or')->value('did'); -// if(empty($did)){ -// $reslut = '';//返回数据 -// }else{ -// if($type == 9){ -// $reslut = db::name('vs_decorate')->where('did', $did)->value('base_image'); -// }else{ -// $reslut = db::name('vs_decorate')->where('did', $did)->value('play_image'); -// } -// } -// } -// return $reslut; -// -// } - public function user_decorate_detail($id, $type){ //根据$type 组装查询条件 $reslut = ""; diff --git a/application/api/model/UserMessage.php b/application/api/model/UserMessage.php index 1210999..c42459e 100644 --- a/application/api/model/UserMessage.php +++ b/application/api/model/UserMessage.php @@ -151,6 +151,10 @@ class UserMessage extends Model if($v['type'] == 1){ $v['content'] = '【'.$v['title'].'】' . $v['content']; } + if($v['type'] == 6){ + $guild_user_invited = db::name('vs_guild_user_invited')->where('message_id', $v['id'])->field('status')->find(); + $v['guild_invited_status'] = $guild_user_invited['status']; + } } }