diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php index 3a1207b5..d94aa9bc 100644 --- a/application/api/model/Tasks.php +++ b/application/api/model/Tasks.php @@ -803,12 +803,24 @@ class Tasks extends Model //未完成任务数量 public function daily_tasks_unfinished_count($user_id){ - $task_ids = Db::name('vs_tasks')->where('delete_time',0)->where('is_active',1)->value('id'); + $task_ids = Db::name('vs_tasks')->where('delete_time',0)->where(['is_active'=>1,'id'=>['<>',1]])->select(); $result = []; - $task_user_count = Db::name('vs_tasks_user_daily') - ->where(['user_id'=>$user_id,'is_claimed'=>0,'is_completed'=>1]) - ->whereIn('task_id',$task_ids) - ->count(); + $task_user_count = 0; + foreach($task_ids as $k=>$v){ + if($v['task_type']==2){ + $task_user = Db::name('vs_tasks_user_daily') + ->where(['user_id'=>$user_id,'is_claimed'=>0,'is_completed'=>1]) + ->where('task_id',$v['id']) + ->whereTime('createtime', 'today') + ->count(); + }else{ + $task_user = Db::name('vs_tasks_user_daily') + ->where(['user_id'=>$user_id,'is_claimed'=>0,'is_completed'=>1]) + ->where('task_id',$v['id']) + ->count(); + } + $task_user_count +=$task_user; + } $result['num'] = $task_user_count; return ['code' => 1, 'msg' => '成功','data' => $result]; }