From c73d2a7422e137ea1f09eff4790dfa8698345d89 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 23 Oct 2023 17:53:14 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BB=BB=E5=8A=A18=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/task/TaskLogic.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index ba911b2d5..9477b6c38 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -2204,11 +2204,7 @@ class TaskLogic extends BaseLogic
                     break;
                 // 日常管理及其他临时任务
                 case 'village_task_type_8':
-                    // 该任务的判定都需要上传资料，后台审批任务是否完成.   因此每天自动结算时，任务状态不为完成的，都做关闭任务处理
-                    $task = Task::where(['id'=>$taskSchedulePlan['task_id']])->find();
-                    if ($task['status'] != 3) {
-                        (new Task())->closeTask($taskSchedulePlan['task_id']);
-                    }
+                    self::dealVillageTask8($taskSchedulePlan);
                     break;
                 default:
                     return true;
@@ -2566,6 +2562,11 @@ class TaskLogic extends BaseLogic
 
     public static function dealVillageTask8($taskSchedulePlan)
     {
+        $taskTemplateInfo = $taskSchedulePlan['template_info'];
+        $villageCompany = Company::where(['id' => $taskTemplateInfo['company_id']])->find();
+        $task = Task::where('id', $taskSchedulePlan['task_id'])->find();
 
+        $task['money'] = $taskTemplateInfo['money_three'];
+        (new VillageShareProfit())->dealVillageTaskSettlement8($task, $villageCompany, $taskSchedulePlan);
     }
 }