diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index a752ad993..9002436d5 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -627,9 +627,9 @@ class TaskLogic extends BaseLogic // 判定完成条件 组建成功的小组服务团队 每日完成档案更新任务和三轮车任务 的团队数量 >= 80% 小于80%则视为未完成 foreach ($groupServiceCompanyList as $groupServiceCompany) { // 档案更新任务 - $taskType31 = Task::where(['company_id' => $groupServiceCompany['id'], 'type' => 31, 'status' => 3])->find(); + $taskType31 = Task::where(['company_id' => $groupServiceCompany['id'], 'type' => 31, 'status' => 3])->whereDay('start_time', 'today')->find(); // 三轮车任务 - $taskType32 = Task::where(['company_id' => $groupServiceCompany['id'], 'type' => 32, 'status' => 3])->find(); + $taskType32 = Task::where(['company_id' => $groupServiceCompany['id'], 'type' => 32, 'status' => 3])->whereDay('start_time', 'today')->find(); if (!empty($taskType31) && !empty($taskType32)) { $doneTaskGroupServiceCompanyCount++; } @@ -692,7 +692,7 @@ class TaskLogic extends BaseLogic $lastTaskSchedulePlan = TaskSchedulingPlan::where(['template_id'=>$taskTemplateInfo['id'], 'is_pay'=>1])->order('start_time', 'desc')->find(); // 上一次结算后到现在,完成的任务次数 $doneTaskCount = Task::where(['template_id'=>$taskTemplateInfo['id'], 'status'=>3])->whereBetween('start_time', [$lastTaskSchedulePlan['start_time'], time()])->count(); - if ($doneTaskCount >= 4) { + if ($doneTaskCount >= 8) { $task['money'] = bcmul($taskTemplateInfo['stage_day_two'], $taskTemplateInfo['money_two'], 2); (new TownShareProfit())->townTaskType4($task, $townCompany, $taskSchedulePlan); } @@ -713,7 +713,7 @@ class TaskLogic extends BaseLogic $lastTaskSchedulePlan = TaskSchedulingPlan::where(['template_id'=>$taskTemplateInfo['id'], 'is_pay'=>1])->order('start_time', 'desc')->find(); // 上一次结算后到现在,完成的任务次数 $doneTaskCount = Task::where(['template_id'=>$taskTemplateInfo['id'], 'status'=>3])->whereBetween('start_time', [$lastTaskSchedulePlan['start_time'], time()])->count(); - if ($doneTaskCount >= 4) { + if ($doneTaskCount >= 8) { $task['money'] = bcmul($taskTemplateInfo['stage_day_three'], $taskTemplateInfo['new_money_three'], 2); (new TownShareProfit())->townTaskType4($task, $townCompany, $taskSchedulePlan); }