提交修复
This commit is contained in:
parent
4f40469615
commit
0dcccba2a8
@ -38,17 +38,18 @@ class TaskController extends BaseApiController{
|
||||
->field(['id', 'title','money','template_id','director_uid', 'company_id', 'start_time', 'end_time', 'director_uid', 'type', 'status', 'content','extend'])
|
||||
->page($page,25)
|
||||
->order(['id' => 'desc','status'=>'asc'])
|
||||
->select()->each(function($item){
|
||||
if($item->type==33){
|
||||
->select()->toArray();
|
||||
foreach($res as $k=>$item){
|
||||
if($item['type']==33){
|
||||
$company = Company::where('id', $item['company_id'])->field('id,deposit,company_money,user_id,day_count,company_type,province,city,area,street,village,brigade')->find(); // 可能要判断预存金是否满足
|
||||
$res=App(RemoteController::class)->shang_date_total_price($company);
|
||||
if($res!=false){
|
||||
$item->extend['transaction']=$res;
|
||||
$find=App(RemoteController::class)->shang_date_total_price($company);
|
||||
if($find!=false){
|
||||
$res[$k]['extend']['transaction']=$find;
|
||||
}else{
|
||||
$item->extend['transaction']='';
|
||||
$res[$k]['extend']['transaction']='';
|
||||
}
|
||||
}
|
||||
})->toArray();
|
||||
}
|
||||
return $this->success('ok', $res);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user