From 42e20bc12f028a149c0088dedd6e65ccc9581e07 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 18 Aug 2023 18:11:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/CeshiController.php               |  2 +-
 app/common/logic/task_template/TaskTemplateLogic.php | 11 +++++++++++
 app/task/TaskCron.php                                |  4 ++--
 app/task/TaskSettlementCron.php                      |  4 ++--
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php
index c2292cd73..10afd80d5 100644
--- a/app/api/controller/CeshiController.php
+++ b/app/api/controller/CeshiController.php
@@ -18,7 +18,7 @@ class CeshiController extends BaseApiController
     {
 //         $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
 // halt($all);
-        $all=TaskSchedulingPlan::where('id',411)->with(['template_info','scheduling'])->select()->toArray();
+        $all=TaskSchedulingPlan::whereDay('end_time')->where('is_pay',0)->with(['template_info','scheduling'])->select()->toArray();
         foreach($all as $k=>$v){
             queue(TaskInformationJob::class,$v);
         }
diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php
index 75849d4d9..6c827b5e5 100644
--- a/app/common/logic/task_template/TaskTemplateLogic.php
+++ b/app/common/logic/task_template/TaskTemplateLogic.php
@@ -42,11 +42,22 @@ class TaskTemplateLogic extends BaseLogic
         Db::startTrans();
         try {
             $moeny=TaskTemplate::where('company_id', $params['company_id'])->sum('money');
+            $money_two=TaskTemplate::where('company_id', $params['company_id'])->sum('money_two');
+            $money_three=TaskTemplate::where('company_id', $params['company_id'])->sum('money_three');
             $SchedulingMoney=TaskScheduling::where('company_id', $params['company_id'])->value('money');
+
             if($moeny+$params['money']>$SchedulingMoney){
                 self::setError('任务模板合计金额不能大于任务调度金额');
                 return false;
             }
+            if($money_two+$params['money']>$SchedulingMoney){
+                self::setError('任务模板合计金额不能大于任务调度金额');
+                return false;
+            }
+            if($money_three+$params['money']>$SchedulingMoney){
+                self::setError('任务模板合计金额不能大于任务调度金额');
+                return false;
+            }
             TaskTemplate::create([
                 'title' => $params['title'],
                 'admin_id' => $params['admin_id'],
diff --git a/app/task/TaskCron.php b/app/task/TaskCron.php
index 9c0be90a6..788b89c79 100644
--- a/app/task/TaskCron.php
+++ b/app/task/TaskCron.php
@@ -13,8 +13,8 @@ class TaskCron  extends Task{
 
     public function configure()
     {
-        // $this->daily(); //设置任务的周期，每天执行一次，更多的方法可以查看源代码，都有注释
-        $this->everyMinute();
+        $this->daily(); //设置任务的周期，每天执行一次，更多的方法可以查看源代码，都有注释
+        // $this->everyMinute();
     }
     /**
      * 执行任务
diff --git a/app/task/TaskSettlementCron.php b/app/task/TaskSettlementCron.php
index 226c2d30b..bdf00119b 100644
--- a/app/task/TaskSettlementCron.php
+++ b/app/task/TaskSettlementCron.php
@@ -11,8 +11,8 @@ class TaskSettlementCron  extends Task{
 
     public function configure()
     {
-        // $this->daily(); //设置任务的周期，每天执行一次，更多的方法可以查看源代码，都有注释
-        $this->everyMinute();
+        $this->daily(); //设置任务的周期，每天执行一次，更多的方法可以查看源代码，都有注释
+        // $this->everyMinute();
     }
     /**
      * 任务结算