From 260bdba28056038f723511cb62062ecf7eb0dc04 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 14 Aug 2023 16:00:21 +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/adminapi/lists/task_template/TaskTemplateLists.php | 2 +-
 app/api/controller/CeshiController.php                 | 4 ++--
 app/common/logic/task_template/TaskTemplateLogic.php   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/task_template/TaskTemplateLists.php b/app/adminapi/lists/task_template/TaskTemplateLists.php
index 164ea72d1..0f117879d 100644
--- a/app/adminapi/lists/task_template/TaskTemplateLists.php
+++ b/app/adminapi/lists/task_template/TaskTemplateLists.php
@@ -55,7 +55,7 @@ class TaskTemplateLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function lists(): array
     {
         return TaskTemplate::where($this->searchWhere)
-            ->field(['id', 'title', 'admin_id', 'money', 'type', 'status', 'content','stage_day_one','proportion_one','stage_day_two','mediumint_two'])
+            ->field(['id', 'title', 'admin_id', 'money', 'type', 'status', 'content','stage_day_one','proportion_one','stage_day_two','proportion_two'])
             ->with(['admin','data_type'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php
index 4ac37806a..b504ef6fb 100644
--- a/app/api/controller/CeshiController.php
+++ b/app/api/controller/CeshiController.php
@@ -12,7 +12,8 @@ class CeshiController extends BaseApiController
 
     public function index()
     {
-        $all=TaskSchedulingPlan::whereDay('start_time','yesterday')->with(['template_info','scheduling'])->select();
+        $all=TaskSchedulingPlan::whereDay('end_time','yesterday')->where('is_pay',0)->with(['template_info','scheduling'])->select();
+halt($all);
         foreach($all as $k=>$data){
             $task_id=explode(',',$data['task_id']);
             $task_count=Task::where('id','in',$task_id)->field('director_uid')->with('director_info')->select();
@@ -38,7 +39,6 @@ halt(2);
         $time=strtotime(date('Y-m-d'));
         $tiem_end=$time+86399;
         $all=TaskSchedulingPlan::where('start_time','between',[$time,$tiem_end])->where('is_execute',0)->with(['template_info','scheduling'])->select()->toArray();
-        halt($all);
         foreach($all as $k=>$v){
             TaskLogic::CronAdd($v);
         }
diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php
index 7454717f9..eef446f26 100644
--- a/app/common/logic/task_template/TaskTemplateLogic.php
+++ b/app/common/logic/task_template/TaskTemplateLogic.php
@@ -50,7 +50,7 @@ class TaskTemplateLogic extends BaseLogic
                 'stage_day_one' => $params['stage_day_one'],
                 'proportion_one' => $params['proportion_one'],
                 'stage_day_two' => $params['stage_day_two'],
-                'mediumint_two' => $params['mediumint_two'],
+                'proportion_two' => $params['proportion_two'],
             ]);
 
             Db::commit();
@@ -84,7 +84,7 @@ class TaskTemplateLogic extends BaseLogic
                 'stage_day_one' => $params['stage_day_one'],
                 'proportion_one' => $params['proportion_one'],
                 'stage_day_two' => $params['stage_day_two'],
-                'mediumint_two' => $params['mediumint_two'],
+                'proportion_two' => $params['proportion_two'],
             ]);
 
             Db::commit();