dev #21

Merged
weiz merged 11 commits from dev into master 2023-11-07 16:57:39 +08:00
2 changed files with 7 additions and 6 deletions
Showing only changes of commit 6f06bb6843 - Show all commits

View File

@ -87,19 +87,19 @@
if($contract['type'] == 0){ if($contract['type'] == 0){
$smsTitle = '《租赁合同》'; $smsTitle = '《租赁合同》';
if(empty($contract['contract_logistic_id'])){ if(empty($contract['contract_logistic_id'])){
$notify_url = env('project.website_domain').'/api/notify/systemCarRent'; $notify_url = env('project.web_domain').'/api/notify/systemCarRent';
}else{ }else{
$notify_url = env('project.website_domain').'/api/notify/townCarRent'; $notify_url = env('project.web_domain').'/api/notify/townCarRent';
} }
}elseif($contract['type'] == 1){ }elseif($contract['type'] == 1){
$smsTitle = '《自有车辆上传合同》'; $smsTitle = '《自有车辆上传合同》';
$notify_url = env('project.website_domain').'/api/notify/selfCarRent'; $notify_url = env('project.web_domain').'/api/notify/selfCarRent';
}elseif($contract['type'] == 2){ }elseif($contract['type'] == 2){
$smsTitle = '《解约合同》'; $smsTitle = '《解约合同》';
$notify_url = env('project.website_domain').'/api/notify/cancelRent'; $notify_url = env('project.web_domain').'/api/notify/cancelRent';
}elseif($contract['type'] == 3){ }elseif($contract['type'] == 3){
$smsTitle = '《购买合同》'; $smsTitle = '《购买合同》';
$notify_url = env('project.website_domain').'/api/notify/buyCar'; $notify_url = env('project.web_domain').'/api/notify/buyCar';
} }
$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) {

View File

@ -262,7 +262,8 @@ class JunziqianController extends BaseLikeAdminController
//发起PING请求 //发起PING请求
// halt($request); // halt($request);
$response = $requestUtils->doPost("/v2/sign/applySign", $request); $response = $requestUtils->doPost("/v2/sign/applySign", $request);
Log::write('三轮车签约:'.json_encode($response).'地址:'.$notify,'notice'); $response['notify_url'] = $notify;
Log::write('三轮车签约:'.json_encode($response),'notice');
return $response; return $response;
} }