From eba24310bcbec8173dd9ab0c69c061d68abecaa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 11 Dec 2025 09:00:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/UserData.php |  2 +-
 application/api/controller/Xintiao.php  | 24 ++++++++++
 application/api/model/Family.php        | 10 ++--
 application/api/model/Friend.php        | 11 +++++
 application/api/model/GiveGift.php      | 62 +++++++++++++++++++++++++
 application/api/model/Login.php         | 14 ++----
 application/api/model/Room.php          | 57 +++++++++--------------
 application/api/model/RoomAuction.php   |  6 +++
 application/api/model/Sign.php          | 26 +++++++----
 application/api/model/SingerSong.php    | 12 +++++
 application/api/model/User.php          | 19 +++-----
 application/api/model/UserData.php      |  6 ++-
 application/api/model/UserZone.php      |  5 +-
 13 files changed, 179 insertions(+), 75 deletions(-)

diff --git a/application/api/controller/UserData.php b/application/api/controller/UserData.php
index 79c17d0c..8cb9e2ba 100644
--- a/application/api/controller/UserData.php
+++ b/application/api/controller/UserData.php
@@ -134,7 +134,7 @@ class UserData extends BaseCom
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
-    //实名认证结果获取
+    //实名认证成功后通知后端
     public function real_name_result()
     {
         $orderNo = input('orderNo',  '');
diff --git a/application/api/controller/Xintiao.php b/application/api/controller/Xintiao.php
index 19903691..21f0eb47 100644
--- a/application/api/controller/Xintiao.php
+++ b/application/api/controller/Xintiao.php
@@ -30,6 +30,30 @@ class Xintiao extends BaseCom
                 'updatetime' => time()
             ]);
         }
+        //任务：18-每日在线时长 5 分钟
+        model('Tasks')->tasks_complete($user_id,18);
+        //任务：19-每日在线时长 10 分钟
+        model('Tasks')->tasks_complete($user_id,19);
+        //任务：20-每日在线时长 15 分钟
+        model('Tasks')->tasks_complete($user_id,20);
+
+
+        //获取房间的类型
+        $room_type = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
+        //查询徒弟是否是首签的徒弟 sign_user_type:被签用户的类型：0-首次被签，1-签约过期，2-违约签
+        $uid = db::name('vs_user_sign')
+            ->where(['sign_user_id' => $user_id,'sign_user_type' => 0,'end_time' => ['>',time()]])->value('parent_user_id');
+        if($room_type == 2 && $uid){
+            //任务：21-邀请徒弟在拍卖房停留（0/5）分钟，并送给徒弟（0/1 ，特殊礼物）
+            model('Tasks')->tasks_complete($uid, 21, 1);
+        }
+
+        if($room_type == 7 && $uid){
+            //任务：23-邀请徒弟在交友房停留（0/5）分钟，并送给徒弟（0/1 ，特殊礼物）
+            model('Tasks')->tasks_complete($uid, 23, 1);
+        }
+
+
         return V(1, '成功', null);
     }
 
diff --git a/application/api/model/Family.php b/application/api/model/Family.php
index 92891666..e75b69f2 100644
--- a/application/api/model/Family.php
+++ b/application/api/model/Family.php
@@ -72,9 +72,8 @@ class Family extends Model
         $myFamily['group_owner_info']['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        if($isSinnger){
-            $myFamily['group_owner_info']['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-        }
+        $myFamily['group_owner_info']['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+
         $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
         $myFamily['group_owner_info']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
         $myFamily['group_owner_info']['nobility_image'] = $Nobility['play_image'];
@@ -100,10 +99,9 @@ class Family extends Model
                     $lists[$k]['icon'][1] = model('api/UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
                     $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                    if($isSinnger){
-                        $lists[$k]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])
+                    $lists[$k]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])
                             ->value('image');//等级图标
-                    }
+
                     $Nobility = model('api/Nobility')->getUserNobilityInfo($v['user_id']);
                     $lists[$k]['mic_cycle'] = model('api/Decorate')->user_decorate_detail($v['user_id'],3);
                     $lists[$k]['nobility_image'] = $Nobility['play_image'];
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 34fe04a4..312d66ed 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -230,6 +230,17 @@ class Friend extends Model
             $text1['text'] = '交友结束';
             $text1['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text1);
+            //查询是否第一次创建关系
+            $friend_count1 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user1,'status'=>3])->whereOr(['user2_id'=>$user1,'status'=>3])->count();
+            if($friend_count1 == 1){
+                //任务：10-第一次星球房卡关系（互娱房）
+                model('Tasks')->tasks_complete($user1,10);
+            }
+            $friend_count2 = db::name('vs_user_friending_heart')->whereOr(['user1_id'=>$user2,'status'=>3])->whereOr(['user2_id'=>$user2,'status'=>3])->count();
+            if($friend_count2 == 1){
+                //任务：10-第一次星球房卡关系（互娱房）
+                model('Tasks')->tasks_complete($user2,10);
+            }
 
             return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
         } else {
diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php
index d90b7636..591efe3c 100644
--- a/application/api/model/GiveGift.php
+++ b/application/api/model/GiveGift.php
@@ -1004,6 +1004,68 @@ class GiveGift extends Model
         if(!$res){
             return  false;
         }
+        //查询是否第一次送礼
+        $is_first_gift = db::name('vs_give_gift')->where(['user_id'=>$uid])->count();
+        if($is_first_gift == 1){
+            //任务：7-第一次送礼
+            model('Tasks')->tasks_complete($uid,7);
+        }
+        //查询是否第一次收礼
+        $is_first_receive_gift = db::name('vs_give_gift')->where(['gift_user'=>$to_id])->count();
+        if($is_first_receive_gift == 1){
+            //任务：8-第一次收礼
+            model('Tasks')->tasks_complete($to_id,8);
+        }
+
+        //查询收礼人和送礼人的师徒关系
+        //获取系统配置的特殊礼物
+        $special_gift = explode(',',get_system_config_value('master_special_gift'));
+        //收礼人是否是送礼人的师父
+        $is_master = db::name('vs_user_sign')->where(['parent_user_id'=>$to_id,'sign_user_id'=>$uid,'end_time' => ['>=',time()]])->find();
+        if($is_master){
+            if(in_array($gid,$special_gift)){
+                //任务：14-每日给师傅送一个特定的礼物
+                model('Tasks')->tasks_complete($uid,14);
+                //查询今天是否送过礼物了
+                $is_today_gift = db::name('vs_give_gift')
+                    ->where(['user_id'=>$uid,'gift_user'=>$to_id,'createtime' => ['>=',strtotime(date('Y-m-d'))],'gid' => ['in',$special_gift]])->count();
+                if($is_today_gift == 1){
+                    //任务：13-每日收到至少3个徒弟的特殊徐礼物
+                    model('Tasks')->tasks_complete($to_id,13);
+                }
+            }
+        }
+        //收礼人是否是送礼人的徒弟
+        $is_student = db::name('vs_user_sign')->where(['parent_user_id'=>$uid,'sign_user_id'=>$to_id,'end_time' => ['>=',time()]])->find();
+        if($is_student){
+            if(in_array($gid,$special_gift)){
+                //查询今天是否送过礼物了
+                $is_today_gift = db::name('vs_give_gift')
+                    ->where(['user_id'=>$uid,'gift_user'=>$to_id,'createtime' => ['>=',strtotime(date('Y-m-d'))],'gid' => ['in',$special_gift]])->count();
+                if($is_today_gift == 1){
+                    //查询徒弟是否是首签的徒弟 sign_user_type:被签用户的类型：0-首次被签，1-签约过期，2-违约签
+                    $is_students = db::name('vs_user_sign')
+                        ->where(['parent_user_id' => $uid,'sign_user_id' => $to_id,'sign_user_type' => 0,'end_time' => ['>',time()]])->value('id');
+                    if($is_students){
+                        //获取房间的类型
+                        $room_type = db::name('vs_room')->where(['id' => $from_id])->value('type_id');
+                        if($room_type == 2){
+                            //任务：21-邀请徒弟在拍卖房停留（0/5）分钟，并送给徒弟（0/1 ，特殊礼物）
+                            model('Tasks')->tasks_complete($uid,21,2);
+                        }
+                        if($room_type == 9){
+                            //任务：22-邀请徒弟在点唱房点歌（0/1）首，并送给徒弟（0/1 ，特殊礼物）
+                            model('Tasks')->tasks_complete($uid,22,2);
+                        }
+                        if($room_type == 7) {
+                            //任务：23-邀请徒弟在交友房停留（0/5）分钟，并送给徒弟（0/1 ，特殊礼物）
+                            model('Tasks')->tasks_complete($uid, 23, 2);
+                        }
+                    }
+                }
+            }
+        }
+
         return $res;
     }
 
diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 2b60d370..0b35cbcc 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -113,9 +113,7 @@ class Login extends Model
         $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
         return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res];
     }
@@ -225,9 +223,8 @@ class Login extends Model
             $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info['id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
             $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('image');//等级图标
-            }
+            $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);//聊天气泡
 
@@ -431,9 +428,8 @@ class Login extends Model
                 $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info_data['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $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 3da54ea9..99074e6d 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -201,7 +201,11 @@ class Room extends Model
                 //label_id == 3 或 label_id == 4
                 $map['label_id'] = ['in', [3, 4]];
             }
-            if($label_id >= 1){
+            if($label_id == 1){
+                $map['label_id'] = $label_id;
+                $map['type_id'] = 1;
+            }
+            if($label_id > 1){
                 $map['label_id'] = $label_id;
                 $map['type_id'] = ['<>',6];
             }
@@ -1017,9 +1021,8 @@ class Room extends Model
         $user_info['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $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);
             $user_info['agora_rtm_token'] = model('api/Agora')->agora_rtm_token_info($user_id, $room_id);//连麦用的
@@ -1283,9 +1286,8 @@ class Room extends Model
                 $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+
                 //推送告诉前端下了几号麦位
                 $text['text'] = $FromUserInfo['nickname'].' 下麦了 ';
                 $text['FromUserInfo'] = $FromUserInfo;
@@ -1350,9 +1352,8 @@ class Room extends Model
         $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $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);
 
         $text['FromUserInfo'] = $FromUserInfo;
@@ -1436,9 +1437,7 @@ class Room extends Model
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
             }
         }
         return ['code' => 1, 'msg' => '成功', 'data' => $list];
@@ -1537,9 +1536,8 @@ class Room extends Model
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $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);
                 $v['role'] = $role['role'];
@@ -1835,9 +1833,8 @@ class Room extends Model
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
                     $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('image');//等级图标
-                    }
+                    $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);
                     $v['role'] = $role['role'];
@@ -1864,9 +1861,7 @@ class Room extends Model
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
                     $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('image');//等级图标
-                    }
+                    $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);
@@ -1892,9 +1887,7 @@ class Room extends Model
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
                     $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('image');//等级图标
-                    }
+                    $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);
@@ -1960,9 +1953,8 @@ class Room extends Model
         $user_info['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+
         //是否使用靓号
         $user_info['is_use_code'] = 0;
         $user_code = model('Decorate')->user_decorate_detail($user_info['user_id'],6);
@@ -2159,9 +2151,8 @@ class Room extends Model
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $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');
             }
         }
@@ -3207,9 +3198,7 @@ class Room extends Model
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
             }
         }
         return ['code' => 1, 'msg' => '操作成功', 'data' => $list];
diff --git a/application/api/model/RoomAuction.php b/application/api/model/RoomAuction.php
index c7f18a2d..d4cb1b01 100644
--- a/application/api/model/RoomAuction.php
+++ b/application/api/model/RoomAuction.php
@@ -322,6 +322,12 @@ class RoomAuction extends Model
             if($room_auction['code'] != 1){
                 return ['code' => 0, 'msg'=>$room_auction['msg'], 'data'=>$room_auction['data']];
             }
+            //查询是否第一次被拍卖成功
+            $is_first = db::name('vs_room_auction')->where(['user_id' => $res['user_id'],'status' => 3,'bidder_user_id' =>['>',0]])->count();
+            if($is_first == 1){
+                //任务：9-第一次拍卖关系
+                model('Tasks')->tasks_complete($res['user_id'],9);
+            }
         }
         //拍卖位下麦
         $host = db::name('vs_room')->where(['id' => $res['room_id']])->value('user_id');
diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php
index 887ddd4b..b2e3dd3c 100644
--- a/application/api/model/Sign.php
+++ b/application/api/model/Sign.php
@@ -150,9 +150,7 @@ class Sign extends Model
         $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($sign_user['user_id']);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $isSinnger = db::name('vs_singer')->where(['user_id' => $sign_user['user_id'],'status' => 1])->value('level');
-        if($isSinnger){
-            $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-        }
+        $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
         //组个列表
         $sign_market_value = get_system_config_value('sign_market_value');
@@ -394,6 +392,19 @@ class Sign extends Model
                 Db::rollback();
                 return ['code' => 0, 'msg' => $dd['msg'], 'data' => null];
             }
+            if($sign_user_type == 0){
+                //任务：6-第一次签约师父
+                model('Tasks')->tasks_complete($sign_user_id,6);
+            }
+            //判定是否 今日第一次签约徒弟
+            $is_first_sign_student = db::name('vs_user_sign')->where(['parent_user_id' => $max_sign_user['user_id'],'createtime' => ['>=',strtotime(date('Y-m-d'))]])->count();
+            if($is_first_sign_student == 1){
+                //任务：16-每日签约一个新徒弟
+                model('Tasks')->tasks_complete($max_sign_user['user_id'],16);
+                //任务：17-每日完成师徒任务之一
+                model('Tasks')->tasks_complete($max_sign_user['user_id'],17);
+            }
+            //提交事务
             db::commit();
             //给前端推送
             $FromUserInfo = db::name('user')->where('id',$max_sign_user['user_id'])->field('id as user_id,nickname,avatar,sex')->find();
@@ -401,17 +412,14 @@ class Sign extends Model
             $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($max_sign_user['user_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
             $isSinnger = db::name('vs_singer')->where(['user_id' => $max_sign_user['user_id'],'status' => 1])->value('level');
-            if($isSinnger){
-                $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-            }
+            $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+
             $ToUserInfo = db::name('user')->where('id',$max_sign_user['sign_user_id'])->field('id as user_id,nickname,avatar,sex')->find();
             $ToUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($max_sign_user['sign_user_id']);//财富图标
             $ToUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($max_sign_user['sign_user_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
             $isSinnger = db::name('vs_singer')->where(['user_id' => $max_sign_user['sign_user_id'],'status' => 1])->value('level');
-            if($isSinnger){
-                $ToUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-            }
+            $ToUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
             $text['text'] = '签约出价最高用户';
             $text['FromUserInfo'] = $FromUserInfo;
diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index df72070d..c535e35d 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -177,6 +177,16 @@ class SingerSong extends Model
             if (!$result) {
                 return ['code' => 0, 'msg' => '点歌失败', 'data' => null];
             }
+            //查询点歌用户是否是首签的徒弟 sign_user_type:被签用户的类型：0-首次被签，1-签约过期，2-违约签
+            $is_students = db::name('vs_user_sign')
+                ->where(['sign_user_id' => $user_id,'sign_user_type' => 0,'end_time' => ['>',time()]])->value('parent_user_id');
+            //第一次点歌
+            $frist_song = db::name('vs_song_log')->where(['user_id' => $user_id])->count();
+            if ($is_students && $frist_song == 1) {
+                //任务：22-邀请徒弟在点唱房点歌（0/1）首
+                model('Tasks')->tasks_complete($is_students,22,1);
+            }
+
             //获取当前房间内点歌总数
             $song_info_count = db::name('vs_song_log')->where(['room_id' => $room_id,'status' => ['in',[0,1]]])->count();
             //给前端推送
@@ -333,6 +343,8 @@ class SingerSong extends Model
             $level = db::name('vs_singer_level')->where(['change_value' => ['<=', $exps]])->order('change_value desc')->find();
             if ($level) {
                 db::name('vs_singer')->where(['id' => $is_singer['id']])->update(['exp' => $exps,'level' => $level['level']]);
+                //任务：15-每日获得歌星经验
+                model('Tasks')->tasks_complete($user_id,15,$exp_coin);
             }
         }
         return true;
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 48be5b9b..2d8a2d56 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -128,9 +128,8 @@ class User extends Model
         $user_info['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+
 
         //关注数
         $user_info['follow_num'] = db::name('user_follow')->where(['user_id' => $uid,'type'=>1])->count();
@@ -251,9 +250,7 @@ class User extends Model
             $v['icon'][1] = model('UserData')->user_charm_icon($v['follow_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
             $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('image');//等级图标
-            }
+            $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
@@ -279,9 +276,7 @@ class User extends Model
             $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
             $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('image');//等级图标
-            }
+            $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
@@ -384,9 +379,7 @@ class User extends Model
         $user_info['icon'][1] = model('UserData')->user_charm_icon($uid) ??  '';//魅力图标
         //判断是否是歌手 如果是 返回等级图标
         $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('image');//等级图标
-        }
+        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
         //查询用户是否有使用靓号
         $user_info['is_use_code'] = 0;
@@ -636,6 +629,8 @@ class User extends Model
             'createtime' => time()
         ];
         db::name('user_album')->insert($data);
+        //任务：4-创建相册
+        model('Tasks')->tasks_complete($user_id,4);
         return ['code' => 1, 'msg' => '创建成功', 'data' => null];
     }
 
diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php
index 1f67fb5b..07c8a419 100644
--- a/application/api/model/UserData.php
+++ b/application/api/model/UserData.php
@@ -357,7 +357,7 @@ class UserData extends Model
         return  ['code' => 1, 'msg' => '获取成功','data' =>$data];
     }
 
-    //实名认证结果
+    //实名认证成功结果通知
     public function real_name_result($user_id,$orderNo)
     {
         $user_mobile = db::name('user')->where(['id' => $user_id,'status'=>1])->value('mobile');
@@ -375,6 +375,8 @@ class UserData extends Model
         if(!$reslut){
             return ['code' => 0, 'msg' => '实名失败','data' =>null];
         }
+        //任务：3-实名认证
+        model('Tasks')->tasks_complete($user_id,3);
 
         return ['code' => 1, 'msg' => '实名成功','data' =>null];
     }
@@ -582,6 +584,8 @@ class UserData extends Model
 //                return ['code' => 0, 'msg' => '绑定失败','data' =>null];
 //            }
 //        }
+        //任务：5-绑定支付信息
+        model('Tasks')->tasks_complete($user_id,5);
         return ['code' => 1, 'msg' => '绑定成功','data' =>null];
     }
 
diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index b154df49..bd5ed519 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -660,9 +660,8 @@ class UserZone extends Model
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
                 $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('image');//等级图标
-                }
+                $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'];
                 $v['nickname_color'] = $Nobility['nick_name_color'];