This commit is contained in:
mkm 2023-08-26 16:52:40 +08:00
parent 70fe33107b
commit 3d916ac153

View File

@ -26,8 +26,6 @@ class TaskController extends BaseApiController
$where[] = ['director_uid', '=', $this->userId];
}
$where[] = ['company_id', '=', $this->userInfo['company_id']];
// $where[]=['status','in',[1,2,3,5]];
}
if (isset($param['date_time']) && $param['date_time'] != '') {
$time = strtotime($param['date_time']);
@ -53,9 +51,11 @@ class TaskController extends BaseApiController
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(); // 可能要判断预存金是否满足
halt($company->toArray(),$param);
$find = App(RemoteController::class)->shang_date_total_price($company,1,$param);
if ($find != false) {
$res[$k]['extend']['transaction'] = $find;
Task::where('id',$item['id'])->update(['extend'=>json_encode(['transaction'=>$find],true)]);
} else {
$res[$k]['extend']['transaction'] = '';
}