From 733a9527b10792de76243da49cfa8ceae58b2b7f Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Tue, 5 Sep 2023 16:34:14 +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 | 10 +++++----- app/common/logic/task/TaskLogic.php | 13 ++++++++----- app/job/TaskInformationJob.php | 15 ++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/api/controller/CeshiController.php b/app/api/controller/CeshiController.php index 54d83ae2a..7273d85ca 100644 --- a/app/api/controller/CeshiController.php +++ b/app/api/controller/CeshiController.php @@ -42,11 +42,11 @@ class CeshiController extends BaseApiController // TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]); // } -// $all=TaskSchedulingPlan::where('id',893)->with(['template_info','scheduling'])->select()->toArray(); -// foreach($all as $k=>$v){ -// queue(TaskInformationJob::class,$v); -// } -// return true; + $all=TaskSchedulingPlan::where('id',928)->with(['template_info','scheduling'])->select()->toArray(); + foreach($all as $k=>$v){ + queue(TaskInformationJob::class,$v); + } +return true; $plan_all = TaskScheduling::where('id',119)->with('company_info')->select()->toArray(); $plan_ids = []; foreach ($plan_all as $k => $v) { diff --git a/app/common/logic/task/TaskLogic.php b/app/common/logic/task/TaskLogic.php index 07ace91ac..4a1a9cb6c 100644 --- a/app/common/logic/task/TaskLogic.php +++ b/app/common/logic/task/TaskLogic.php @@ -74,10 +74,10 @@ 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){ - Task::where('template_id',$v['id'])->update(['start_time'=>$task['start_time']+86400,'end_time'=>$task['end_time']+86400]); + if ($v['types'] == 3) { + $task = Task::where('template_id', $v['id'])->find(); + if ($task) { + Task::where('template_id', $v['id'])->update(['start_time' => $task['start_time'] + 86400, 'end_time' => $task['end_time'] + 86400]); TaskTemplate::where('id', $v['id'])->inc('day_count')->update(); return true; } @@ -148,6 +148,9 @@ class TaskLogic extends BaseLogic $data['director_uid'] = $v['extend']['shareholder']['user_id']; } $data['extend'] = json_encode($v['extend']); + $money_one = bcmul($v['stage_day_one'], $v['money'], 2); + $money_two = bcmul($v['stage_day_two'], $v['money_two'], 2); + $data['money'] = bcadd($money_one, $money_two); } //片区交易 if ($v['type'] == 33) { @@ -165,7 +168,7 @@ class TaskLogic extends BaseLogic $user_count_money = 58 * $user_count_two; } $extend = [ - 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price'=>0]] + 'transaction' => ['arr' => ['day_money' => $user_count_money, 'total_price' => 0]] ]; $data['extend'] = json_encode($extend); // if($user_count_money<$v['transaction_pool']){ diff --git a/app/job/TaskInformationJob.php b/app/job/TaskInformationJob.php index 5ce97d1e7..bddf7276d 100644 --- a/app/job/TaskInformationJob.php +++ b/app/job/TaskInformationJob.php @@ -24,7 +24,7 @@ class TaskInformationJob // //通过这个方法可以检查这个任务已经重试了几次了 // } try { - TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]); + // TaskSchedulingPlan::where('id', $data['id'])->update(['is_pay' => 1]); $company = Company::where('id', $data['company_id'])->field('id,deposit,responsible_area,company_money,shareholder_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足 $arr['status'] = 0; $arr['company_account_type'] = 1; @@ -50,21 +50,18 @@ class TaskInformationJob return false; } $transaction_pool=$data['template_info']['transaction_pool'];//交易金额剩余池 - if(bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2)>$shang_date_total_price['arr']['day_money']){ - if($shang_date_total_price['arr']['total_price']<$shang_date_total_price['arr']['day_money']){ + 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=$shang_date_total_price['arr']['supplement']; }else{ $shang_date_total_price['arr']['supplement']=0; $shang_date_total_price['arr']['after_transaction_pool']=0; $day_money=0; } - $shang_date_total_price['arr']['before_transaction_pool']=$transaction_pool; + $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'=>bcsub($transaction_pool,$day_money,2)]); + TaskTemplate::where('id',$data['template_info']['id'])->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]); $shang_date_total_price['arr']['status']=1; } $name = $shang_date_total_price['name']; @@ -95,9 +92,9 @@ class TaskInformationJob $arr['money'] = $task_35['money']; $arr['company_account_type'] = 2; }else{ - if($day<=$data['template_info']['day_count']){ + if($data['template_info']['day_count']<=$day){ $time = strtotime(date('Y-m-d')); - Task::where('id', $data['task_id'])->update(['create_time' => $time,'end_time' => $time + 86399]); + Task::where('id', $data['task_id'])->update(['create_time' => $time,'end_time' => $time + 86399,'start_time'=>$time,'end_time'=> $time + 86399]); return false; } if($data['template_info']['day_count']>$day){