From e287c5db12e2c6d215d9a86f593c6b9b2dcc573d Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sat, 11 Nov 2023 10:21:27 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E9=95=87=E5=86=9C=E7=A7=91=E5=85=AC?=
 =?UTF-8?q?=E5=8F=B8=E4=BB=BB=E5=8A=A1=E4=B8=89=E4=B8=AA=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=88=86=E5=BC=80=E7=BB=93=E7=AE=97=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=9F=90=E4=B8=AA=E8=A7=92=E8=89=B2=E7=9A=84=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=87=BA=E7=8E=B0=E5=BC=82=E5=B8=B8=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=95=B4=E4=B8=AA=E9=95=87=E5=86=9C=E7=A7=91?=
 =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=9A=84=E4=BB=BB=E5=8A=A1=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E9=83=BD=E7=BB=88=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/CronController.php | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/api/controller/CronController.php b/app/api/controller/CronController.php
index e8cc62762..0eec49bfa 100644
--- a/app/api/controller/CronController.php
+++ b/app/api/controller/CronController.php
@@ -185,7 +185,20 @@ class CronController extends BaseApiController
             ->select()
             ->toArray();
         foreach($taskSchedulingPlanList as $taskSchedulingPlan){
-            queue(TownTaskSettlementJob::class, $taskSchedulingPlan);
+            // 三个角色分开结算，避免某个角色的结算逻辑出现异常，导致整个镇农科公司的任务结算都终止
+            $taskTemplateInfo = $taskSchedulingPlan['template_info'];
+            // 负责人任务结算
+            if ($taskTemplateInfo['extend']['task_role'] == 1) {
+                queue(TownTaskSettlementJob::class, $taskSchedulingPlan);
+            }
+            // 市场部长任务结算
+            if ($taskTemplateInfo['extend']['task_role'] == 2) {
+                queue(TownTaskSettlementJob::class, $taskSchedulingPlan);
+            }
+            // 服务部长任务结算
+            if ($taskTemplateInfo['extend']['task_role'] == 3) {
+                queue(TownTaskSettlementJob::class, $taskSchedulingPlan);
+            }
         }
         Log::info('镇农科公司定时任务结算执行-结束'.date('Y-m-d H:i:s'));
         return $this->success('镇农科公司定时任务结算执行成功');