From 626df0fd650f58908e62b81732554acb5d65db46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 21 Nov 2025 14:11:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=8D=E5=8D=96=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/RoomAuction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/api/model/RoomAuction.php b/application/api/model/RoomAuction.php index 3798b01..37b8d03 100644 --- a/application/api/model/RoomAuction.php +++ b/application/api/model/RoomAuction.php @@ -440,10 +440,10 @@ class RoomAuction extends Model public function room_auction_create_or_add($user_id,$user_id1,$relation_id,$time_day,$cp_room_id){ //查询两人是否已创建该关系 $room = db::name('vs_room_auction_relation') - ->where(['user_id1' => $user_id,'user_id2' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()]])->order('id desc')->find(); + ->where(['user_id1' => $user_id,'user_id2' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()],'delete_time' => 0])->order('id desc')->find(); if(!$room){ $room = db::name('vs_room_auction_relation') - ->where(['user_id2' => $user_id,'user_id1' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()]])->order('id desc')->find(); + ->where(['user_id2' => $user_id,'user_id1' => $user_id1,'relation_id' => $relation_id,'end_time'=>['>',time()],'delete_time' => 0])->order('id desc')->find(); } if($room){ From 8f4975eb22ea893f5f0e1ae7d483c455e8a49cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 21 Nov 2025 14:15:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=AD=8C=E6=89=8B=E7=AD=89=E7=BA=A7?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Login.php | 6 +++--- application/api/model/Room.php | 16 ++++++++-------- application/api/model/User.php | 8 ++++---- application/api/model/UserZone.php | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/application/api/model/Login.php b/application/api/model/Login.php index d742ffa..5abbb0a 100644 --- a/application/api/model/Login.php +++ b/application/api/model/Login.php @@ -104,7 +104,7 @@ class Login extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); if($isSinnger){ - $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res]; @@ -215,7 +215,7 @@ class Login extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info['id'],'status' => 1])->value('level'); if($isSinnger){ - $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } $return_res[0]['dress'] = model('Decorate')->user_decorate_detail($user_info['id'],1); $return_res[0]['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['id'],9);//聊天气泡 @@ -422,7 +422,7 @@ class Login extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info_data['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res]; } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index c75f89f..83defe9 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -926,7 +926,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); if($isSinnger){ - $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } if($is_join){ $user_info['agora_token'] =model('api/Agora')->agora_token_info($user_id, $room_id); @@ -1180,7 +1180,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); if($isSinnger){ - $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } //推送告诉前端下了几号麦位 $text['text'] = $FromUserInfo['nickname'].' 下麦了 '; @@ -1218,7 +1218,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); if($isSinnger){ - $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } $FromUserInfo['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1); @@ -1304,7 +1304,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } } } @@ -1421,7 +1421,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } //用户的角色 $role = $this->get_user_role($v['user_id'], $room_id); @@ -1535,7 +1535,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level'); if($isSinnger){ - $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } //是否使用靓号 $user_info['is_use_code'] = 0; @@ -1727,7 +1727,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } $v['earnings'] = db::name('vs_user_money_log')->where(['user_id' => $v['user_id'],'room_id' => $room_id,'money_type' => 2,'change_type' => 19])->sum('change_value'); } @@ -2750,7 +2750,7 @@ class Room extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } } } diff --git a/application/api/model/User.php b/application/api/model/User.php index 5878169..c3dcb3b 100644 --- a/application/api/model/User.php +++ b/application/api/model/User.php @@ -129,7 +129,7 @@ class User extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level'); if($isSinnger){ - $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } //关注数 @@ -229,7 +229,7 @@ class User extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['follow_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; @@ -257,7 +257,7 @@ class User extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } } return ['code' => 1, 'msg' => '获取成功', 'data' => $list]; @@ -362,7 +362,7 @@ class User extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level'); if($isSinnger){ - $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } //查询用户是否有使用靓号 diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php index e9ab8ab..b154df4 100644 --- a/application/api/model/UserZone.php +++ b/application/api/model/UserZone.php @@ -661,7 +661,7 @@ class UserZone extends Model //判断是否是歌手 如果是 返回等级图标 $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level'); if($isSinnger){ - $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('rights_icon');//等级图标 + $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标 } $Nobility = model('Nobility')->getUserNobilityInfo($v['user_id']);//nobility_image $v['nobility_image'] = $Nobility['play_image'];