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-11 12:15:18 +08:00
parent a03b29f00e
commit e808faa9c5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,15 +93,13 @@ class TaskController extends BaseApiController
$parmas['start_time']=date('Y-m-d',$task['start_time']); $parmas['start_time']=date('Y-m-d',$task['start_time']);
$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, 1, $parmas); $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
$shang_date_total_price = App(RemoteController::class)->shang_date_total_price($company,$parmas);
if ($task != false) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
$find['extend']=$task['extend']; $find['extend']=$task['extend'];
$find['extend']['transaction']['arr']['total_price']=$shang_date_total_price['arr']['total_price']??0;
if($transaction_pool==0){ if($transaction_pool==0){
$find['transaction_pool']=0; $find['arr']['transaction_pool']=0;
}else{ }else{
$find['transaction_pool']=$transaction_pool; $find['arr']['transaction_pool']=$transaction_pool;
} }
return $this->success('ok', $find); return $this->success('ok', $find);
} }