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

Merge pull request 'update' (#112) from zhangwei into dev

Browse Source 
Reviewed-on: #112
This commit is contained in:
weiz 2023-10-18 14:42:11 +08:00
commit d615e50733
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -329,8 +329,8 @@ class IndexController extends BaseApiController
//添加车辆到物流系统 //添加车辆到物流系统
$vehicle = json_decode($contract['cars_info'], true); $vehicle = json_decode($contract['cars_info'], true);
$curl_res = curl_post(env('project.logistic_domain').'/api/addSelfCar', [], [ $curl_res = curl_post(env('project.logistic_domain').'/api/addSelfCar', [], [
'license' => $vehicle['license'], 'license' => $vehicle[0]['license'],
'pic' => $vehicle['pic'], 'pic' => $vehicle[0]['pic'],
'company_id' => $contract['company_a_id'], 'company_id' => $contract['company_a_id'],
'company_name' => $contract['company_a_name'], 'company_name' => $contract['company_a_name'],
'company_user' => $contract['company_a_user'], 'company_user' => $contract['company_a_user'],
@ -339,7 +339,7 @@ class IndexController extends BaseApiController
if (!$curl_res || $curl_res['code'] == 0) { if (!$curl_res || $curl_res['code'] == 0) {
return json(['success' => false, 'msg' => '失败2.6']); return json(['success' => false, 'msg' => '失败2.6']);
} }
$cars_info = json_encode(['id' => $curl_res['data']['car_id'], 'license' => $vehicle['license']]); $cars_info = json_encode(['id' => $curl_res['data']['car_id'], 'license' => $vehicle[0]['license']]);
//获取签约后的合同 //获取签约后的合同
$signContractFile = app(JunziqianController::class)->downloadVehicleContractFile($contract['contract_no']); $signContractFile = app(JunziqianController::class)->downloadVehicleContractFile($contract['contract_no']);
$signContractFile = $signContractFile ?? ''; $signContractFile = $signContractFile ?? '';
@ -357,7 +357,7 @@ class IndexController extends BaseApiController
'car_id' => $curl_res['data']['car_id'], 'car_id' => $curl_res['data']['car_id'],
'contract_id' => $contract['id'], 'contract_id' => $contract['id'],
'company_id' => $contract['company_a_id'], 'company_id' => $contract['company_a_id'],
'car_license' => $vehicle['license'], 'car_license' => $vehicle[0]['license'],
'status' => 2, 'status' => 2,
'rent_time' => time(), 'rent_time' => time(),
'rent_contract_id' => $contract['id'], 'rent_contract_id' => $contract['id'],
@ -374,13 +374,6 @@ class IndexController extends BaseApiController
'use_user_name' => $party_b['master_name'], 'use_user_name' => $party_b['master_name'],
'use_user_phone' => $party_b['master_phone'] 'use_user_phone' => $party_b['master_phone']
]); ]);
CompanyProperty::create([
'company_id' => $contract['company_b_id'],
'object_id' => $car_id,
'type' => 1,
'create_time' => time(),
'update_time' => time(),
]);
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);
} else { } else {
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);

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

@ -9,7 +9,6 @@ use app\common\model\contract\VehicleContract;
use app\common\model\vehicle\VehicleBuyRecord; use app\common\model\vehicle\VehicleBuyRecord;
use app\common\model\vehicle\VehicleRent; use app\common\model\vehicle\VehicleRent;
use think\facade\Db; use think\facade\Db;
use function Symfony\Component\Translation\t;
class VehicleController extends BaseApiController class VehicleController extends BaseApiController
{ {