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

修改

Browse Source
This commit is contained in:
shengchanzhe 2023-09-13 15:09:33 +08:00
parent 7bf2e79ab7
commit 40d98b8e44
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/api/controller/TaskController.php
View File

@ -95,7 +95,6 @@ class TaskController extends BaseApiController
$parmas['end_time']=$task['end_time'].' 23:59:59'; $parmas['end_time']=$task['end_time'].' 23:59:59';
$list = App(RemoteController::class)->shang_date_list($company, $parmas); $list = App(RemoteController::class)->shang_date_list($company, $parmas);
$shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas,$task['template_id']); $shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas,$task['template_id']);
if ($task != false) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
if($transaction_pool==0){ if($transaction_pool==0){
@ -103,6 +102,11 @@ class TaskController extends BaseApiController
}else{ }else{
$task['extend']['transaction']['arr']['transaction_pool']=bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2); $task['extend']['transaction']['arr']['transaction_pool']=bcadd($shang_date_total_price['arr']['total_price'],$transaction_pool,2);
} }
if($task['start_time']<strtotime(date('Y-m-d'))){
$task['extend']['transaction']['arr']['is_show']=false;
}else{
$task['extend']['transaction']['arr']['is_show']=true;
}
$find['extend']=$task['extend']; $find['extend']=$task['extend'];
return $this->success('ok', $find); return $this->success('ok', $find);
} }