From 2b7771b88b454930d137578f2b7aa0d253059630 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 1 Sep 2023 10:40:01 +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/CompanyController.php |  6 +++---
 app/common/logic/task/TaskLogic.php      | 12 ++++++++++++
 app/job/TaskInformationJob.php           | 10 ++++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php
index 0d2fda0e5..705547ea6 100644
--- a/app/api/controller/CompanyController.php
+++ b/app/api/controller/CompanyController.php
@@ -216,14 +216,14 @@ class CompanyController extends BaseApiController
             }
             $village_info = Company::where('village', $find['village'])->where('company_type', 17)->find();
             if ($village_info) {
-                $find['is_amount_turned'] = 1;
+                $find['is_village'] = 1;
             } else {
-                $find['is_amount_turned'] = 0;
+                $find['is_village'] = 0;
             }
         } else {
             $find['contract_url'] = '';
             $find['contract_time'] = '';
-            $find['is_amount_turned'] = 0;
+            $find['is_village'] = 0;
         }
         return $this->success('ok', $find);
     }
diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php
index 17b3fd2d8..eeeadbfb7 100644
--- a/app/common/logic/task/TaskLogic.php
+++ b/app/common/logic/task/TaskLogic.php
@@ -74,6 +74,18 @@ class TaskLogic extends BaseLogic
     public static function CronAdd(array $v, $datas): bool
     {
         try {
+            if($v['types']==3){
+                $task=Task::where('template_id',$v['id'])->find();
+                if($task){
+                    // $create_time=strtotime($task['create_time']);
+                    // $create_time = date('Y-m-d H:i:s', strtotime('+1 day', $create_time));
+                    $start_time = date('Y-m-d H:i:s', strtotime('+1 day', $task['start_time']));
+                    $end_time = date('Y-m-d H:i:s', strtotime('+1 day', $task['end_time']));
+                    Task::where('template_id',$v['id'])->update(['start_time'=>$start_time,'end_time'=>$end_time]);
+                    TaskTemplate::where('id', $v['id'])->inc('day_count')->update();
+                    return true;
+                }
+            }
             $time = strtotime(date('Y-m-d'));
             $TaskSchedulingPlan_data = [
                 'create_user_id' => 0,
diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php
index 527f5fa80..6f9978c6a 100644
--- a/app/job/TaskInformationJob.php
+++ b/app/job/TaskInformationJob.php
@@ -42,7 +42,7 @@ class TaskInformationJob
             } elseif
             //交易金额
             ($data['template_info']['type'] == 33) {
-                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company);
+                $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,2);
                 if ($shang_date_total_price == false) {
                     Log::info('交易金额任务，交易金额未达到要求：' . json_encode($data));
                     Task::where('id', $data['task_id'])->update(['status' => 5]);
@@ -99,9 +99,11 @@ class TaskInformationJob
                             Task::where('id', $data['task_id'])->update(['create_time' => $time,'end_time' => $time + 86399]);
                             return false;
                         }
-                        Task::where('id', $data['task_id'])->update(['status' =>5]);
-                        Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data));
-                        return false;
+                        if($data['template_info']['day_count']>$day){
+                            Task::where('id', $data['task_id'])->update(['status' =>5]);
+                            Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为超时：' . json_encode($data));
+                            return false;
+                        }
                     }
                 }else{
                     Log::info('入股任务 ' . $data['template_info']['title'] . '结算失败，任务为空：' . json_encode($data));