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 13:42:32 +08:00
parent e808faa9c5
commit c4b518e85e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,6 +86,7 @@ class TaskController extends BaseApiController
if(!$task){ if(!$task){
return $this->fail('任务不存在'); return $this->fail('任务不存在');
} }
$task=$task->toArray();
$transaction_pool=TaskTemplate::where('id',$task['template_id'])->value('transaction_pool'); $transaction_pool=TaskTemplate::where('id',$task['template_id'])->value('transaction_pool');
$company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足 $company = Company::where('id', $task['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade,responsible_area')->find(); // 可能要判断预存金是否满足
@ -95,12 +96,12 @@ class TaskController extends BaseApiController
$list = App(RemoteController::class)->shang_date_list($company, 1, $parmas); $list = App(RemoteController::class)->shang_date_list($company, 1, $parmas);
if ($task != false) { if ($task != false) {
$find['list'] = $list; $find['list'] = $list;
$find['extend']=$task['extend'];
if($transaction_pool==0){ if($transaction_pool==0){
$find['arr']['transaction_pool']=0; $task['extend']['transaction']['arr']['transaction_pool']=0;
}else{ }else{
$find['arr']['transaction_pool']=$transaction_pool; $task['extend']['transaction']['arr']['transaction_pool']=$transaction_pool;
} }
$find['extend']=$task['extend'];
return $this->success('ok', $find); return $this->success('ok', $find);
} }
return $this->success('ok'); return $this->success('ok');