Merge remote-tracking branch 'origin/develop' into develop

application/api/controller/Room.php

@@ -470,7 +470,7 @@ class Room extends BaseCom
     }
 
 
-    //师徒任务 21  22 23 跳转房间
+    //师徒任务跳转房间
     public function task_jump_room()
     {
         $task_id = input('task_id', 0);

application/api/model/GiveGift.php

@@ -1028,7 +1028,7 @@ class GiveGift extends Model
                 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();
+                    ->where(['user_id'=>$uid,'gift_user'=>$to_id,'createtime' => ['>=',strtotime(date('Y-m-d'))],'gift_id' => ['in',$special_gift]])->count();
                 if($is_today_gift == 1){
                     //任务：13-每日收到至少3个徒弟的特殊徐礼物
                     model('Tasks')->tasks_complete($to_id,13);
@@ -1041,7 +1041,7 @@ class GiveGift extends Model
             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();
+                    ->where(['user_id'=>$uid,'gift_user'=>$to_id,'createtime' => ['>=',strtotime(date('Y-m-d'))],'gift_id' => ['in',$special_gift]])->count();
                 if($is_today_gift == 1){
                     //查询徒弟是否是首签的徒弟 sign_user_type:被签用户的类型：0-首次被签，1-签约过期，2-违约签
                     $is_students = db::name('vs_user_sign')