mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2023-09-05 16:34:14 +08:00
parent 48abd16af8
commit 733a9527b1
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/controller/CeshiController.php
View File

@ -42,11 +42,11 @@ class CeshiController extends BaseApiController
// TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]); // TaskTemplate::where('id',109)->update(['transaction_pool'=>bcadd($transaction_pool,$day_money,2)]);
// } // }
// $all=TaskSchedulingPlan::where('id',893)->with(['template_info','scheduling'])->select()->toArray(); $all=TaskSchedulingPlan::where('id',928)->with(['template_info','scheduling'])->select()->toArray();
// foreach($all as $k=>$v){ foreach($all as $k=>$v){
// queue(TaskInformationJob::class,$v); queue(TaskInformationJob::class,$v);
// } }
// return true; return true;
$plan_all = TaskScheduling::where('id',119)->with('company_info')->select()->toArray(); $plan_all = TaskScheduling::where('id',119)->with('company_info')->select()->toArray();
$plan_ids = []; $plan_ids = [];
foreach ($plan_all as $k => $v) { foreach ($plan_all as $k => $v) {

13
app/common/logic/task/TaskLogic.php
View File

@ -74,10 +74,10 @@ class TaskLogic extends BaseLogic
public static function CronAdd(array $v, $datas): bool public static function CronAdd(array $v, $datas): bool
{ {
try { try {
if($v['types']==3){ if ($v['types'] == 3) {
$task=Task::where('template_id',$v['id'])->find(); $task = Task::where('template_id', $v['id'])->find();
if($task){ if ($task) {
Task::where('template_id',$v['id'])->update(['start_time'=>$task['start_time']+86400,'end_time'=>$task['end_time']+86400]); 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(); TaskTemplate::where('id', $v['id'])->inc('day_count')->update();
return true; return true;
} }
@ -148,6 +148,9 @@ class TaskLogic extends BaseLogic
$data['director_uid'] = $v['extend']['shareholder']['user_id']; $data['director_uid'] = $v['extend']['shareholder']['user_id'];
} }
$data['extend'] = json_encode($v['extend']); $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) { if ($v['type'] == 33) {
@ -165,7 +168,7 @@ class TaskLogic extends BaseLogic
$user_count_money = 58 * $user_count_two; $user_count_money = 58 * $user_count_two;
} }
$extend = [ $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); $data['extend'] = json_encode($extend);
// if($user_count_money<$v['transaction_pool']){ // if($user_count_money<$v['transaction_pool']){

15
app/job/TaskInformationJob.php
View File

@ -24,7 +24,7 @@ class TaskInformationJob
// //通过这个方法可以检查这个任务已经重试了几次了 // //通过这个方法可以检查这个任务已经重试了几次了
// } // }
try { 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(); // 可能要判断预存金是否满足 $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['status'] = 0;
$arr['company_account_type'] = 1; $arr['company_account_type'] = 1;
@ -50,21 +50,18 @@ class TaskInformationJob
return false; return false;
} }
$transaction_pool=$data['template_info']['transaction_pool'];//交易金额剩余池 $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(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);//当天还剩多少 $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; $shang_date_total_price['arr']['supplement']=$day_money;
$transaction_pool=$shang_date_total_price['arr']['supplement'];
}else{ }else{
$shang_date_total_price['arr']['supplement']=0; $shang_date_total_price['arr']['supplement']=0;
$shang_date_total_price['arr']['after_transaction_pool']=0; $shang_date_total_price['arr']['after_transaction_pool']=0;
$day_money=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)]); 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; $shang_date_total_price['arr']['status']=1;
} }
$name = $shang_date_total_price['name']; $name = $shang_date_total_price['name'];
@ -95,9 +92,9 @@ class TaskInformationJob
$arr['money'] = $task_35['money']; $arr['money'] = $task_35['money'];
$arr['company_account_type'] = 2; $arr['company_account_type'] = 2;
}else{ }else{
if($day<=$data['template_info']['day_count']){ if($data['template_info']['day_count']<=$day){
$time = strtotime(date('Y-m-d')); $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; return false;
} }
if($data['template_info']['day_count']>$day){ if($data['template_info']['day_count']>$day){