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

update

Browse Source
This commit is contained in:
unknown 2023-09-04 21:09:37 +08:00
parent 1b475eeba4
commit 007f0f457b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/api/controller/IndexController.php
View File

@ -166,7 +166,9 @@ class IndexController extends BaseApiController
CompanyProperty::create([ CompanyProperty::create([
'company_id' => $contract['company_b_id'], 'company_id' => $contract['company_b_id'],
'object_id' => $vehicle['id'], 'object_id' => $vehicle['id'],
'type' => 1 'type' => 1,
'create_time' => time(),
'update_time' => time(),
]); ]);
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);
} else { } else {
@ -238,7 +240,9 @@ class IndexController extends BaseApiController
CompanyProperty::create([ CompanyProperty::create([
'company_id' => $contract['company_b_id'], 'company_id' => $contract['company_b_id'],
'object_id' => $car_id, 'object_id' => $car_id,
'type' => 1 'type' => 1,
'create_time' => time(),
'update_time' => time(),
]); ]);
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);
} else { } else {
@ -318,6 +322,9 @@ class IndexController extends BaseApiController
$data[$k]['type'] = 0; $data[$k]['type'] = 0;
$data[$k]['status'] = 0; $data[$k]['status'] = 0;
$data[$k]['company_id'] = $model['company_b_id']; $data[$k]['company_id'] = $model['company_b_id'];
$data[$k]['rent_time'] = 0;
$data[$k]['rent_company_id'] = 0;
$data[$k]['contract_id'] = 0;
$data[$k]['create_time'] = strtotime($model['create_time']); $data[$k]['create_time'] = strtotime($model['create_time']);
} }
$vehicleRent = new VehicleRent(); $vehicleRent = new VehicleRent();

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

@ -144,11 +144,11 @@ class VehicleController extends BaseApiController
]; ];
$notify_url = ''; $notify_url = '';
if($contract['type'] == 0){ if($contract['type'] == 0){
$notify_url = 'https://worker-task.lihaink.cn/api/index/systemCarRent'; $notify_url = env('project.website_domain').'/api/index/systemCarRent';
}elseif($contract['type'] == 1){ }elseif($contract['type'] == 1){
$notify_url = 'https://worker-task.lihaink.cn/api/index/selfCarRent'; $notify_url = env('project.website_domain').'/api/index/selfCarRent';
}elseif($contract['type'] == 2){ }elseif($contract['type'] == 2){
$notify_url = 'https://worker-task.lihaink.cn/api/index/cancelRent'; $notify_url = env('project.website_domain').'/api/index/cancelRent';
} }
$signRes = app(JunziqianController::class)->VehicleRentSigning($signData, $params['id'],$notify_url); $signRes = app(JunziqianController::class)->VehicleRentSigning($signData, $params['id'],$notify_url);
if ($signRes->success) { if ($signRes->success) {