From 7862dbdac0b9039f59459ea8b6f2163ad5170b43 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 8 Sep 2023 20:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BB=93=E7=AE=97=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/job/TaskInformationJob.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php
index ca82d7cb7..8d30057c3 100644
--- a/app/job/TaskInformationJob.php
+++ b/app/job/TaskInformationJob.php
@@ -55,14 +55,20 @@ class TaskInformationJob
                     if($shang_date_total_price['arr']['total_price']>$shang_date_total_price['arr']['day_money']){
                         $day_money=bcsub($shang_date_total_price['arr']['total_price'],$shang_date_total_price['arr']['day_money'],2);//当天还剩多少
                         $shang_date_total_price['arr']['supplement']=$day_money;
+                        $transaction_pool=bcadd($transaction_pool,$day_money,2);
                     }else{
                         $shang_date_total_price['arr']['supplement']=0;
                         $shang_date_total_price['arr']['after_transaction_pool']=0;
                         $day_money=0;
+                        $transaction_pool=bcadd($transaction_pool,$shang_date_total_price['arr']['total_price'],2);
+                        $transaction_pool=bcsub($transaction_pool,$shang_date_total_price['arr']['day_money'],2);
+                        if($transaction_pool<0){
+                            $transaction_pool=0;
+                        }
                     }
                     $shang_date_total_price['arr']['before_transaction_pool']=$day_money;
                     Task::where('id', $data['task_id'])->update(['status' => 3,'extend'=>json_encode($shang_date_total_price)]);
-                    TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
+                    TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>$transaction_pool]);
                     $shang_date_total_price['arr']['status']=1;
                 }
                 $name = $shang_date_total_price['name'];
@@ -94,7 +100,14 @@ class TaskInformationJob
                         $arr['company_account_type'] = 2;
                     }else{
                         if($data['template_info']['day_count']<=$day){
-                           Task::where('id', $data['task_id'])->update(['create_time' => $task_35['start_time']+86400,'update_time' =>time(),'start_time'=>$task_35['start_time']+86400,'end_time'=> strtotime($task_35['end_time']) + 86400]);
+              
+                            try{
+                                Task::where('id', $data['task_id'])->update(['create_time' => $task_35['start_time']+86400,'update_time' =>time(),'start_time'=>$task_35['start_time']+86400,'end_time'=>$task_35['start_time']+86400+86399]);
+                            }catch(\Exception $e){
+                                $start_time = strtotime(date('Y-m-d'));
+                                Task::where('id', $data['task_id'])->update(['create_time' => $start_time+86400,'update_time' =>time(),'start_time'=>$start_time+86400,'end_time'=> $start_time + 86400+86399]);
+
+                            }
                            return false;
                         }
                         if($data['template_info']['day_count']>$day){