|
|
@@ -76,7 +76,7 @@ class TaskService extends BaseService
|
|
|
$power = $item['power'];
|
|
|
}
|
|
|
|
|
|
- $logNum = $this->getLogNum($item['id'], $userId, $item['type']);
|
|
|
+ $logNum = $this->getLogNum($userId, $item['id'], $item['type']);
|
|
|
|
|
|
// 次数
|
|
|
if($item['check_type'] == 1 && $item['num']<=$logNum){
|
|
|
@@ -112,7 +112,7 @@ class TaskService extends BaseService
|
|
|
return $data;
|
|
|
}
|
|
|
|
|
|
- $data = TaskLogModel::where(['task_id'=> $taskId,'user_id'=> $userId,'statuss'=>1,'mark'=>1])
|
|
|
+ $data = TaskLogModel::where(['task_id'=> $taskId,'user_id'=> $userId,'status'=>1,'mark'=>1])
|
|
|
->where(function($query) use($type){
|
|
|
// 每日任务
|
|
|
if($type == 1){
|
