diff --git a/app/adminapi/controller/contract/ContractController.php b/app/adminapi/controller/contract/ContractController.php index eb657f7f..bffcac4f 100644 --- a/app/adminapi/controller/contract/ContractController.php +++ b/app/adminapi/controller/contract/ContractController.php @@ -78,7 +78,6 @@ class ContractController extends BaseAdminController "identityType" => 12, "master_phone" => $contract['company_b_phone'], "type"=>"party_b" - ], ]; diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 39b21ade..f1aef401 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -29,13 +29,9 @@ use think\response\Json; */ class IndexController extends BaseApiController { - - public array $notNeedLogin = ['index', 'config', 'policy', 'decorate','notifyUrl']; private $domain = 'https://worker-task.lihaink.cn'; -// private $domain = 'http://www.task.local'; - /** * @notes 首页数据 @@ -110,19 +106,25 @@ class IndexController extends BaseApiController if($contract['status'] != 2){ return json(['success' => false, 'msg' => '合同状态错误']); } - $vehicle = json_decode($contract['cars_info'],true); if ($contract['signing_timer'] == 0) { //更新本地合同状态 - Contract::where('id',$contract['id'])->update(['signing_timer'=>1]); + $updateLocalRes = Contract::where('id',$contract['id'])->update(['signing_timer'=>1]); //更新远程 - curl_post($this->domain.'/api/index/notifyVehicleContractUpdate',[],[ + $updateSverRes =curl_post($this->domain.'/api/index/notifyVehicleContractUpdate',[],[ 'contract_logistic_id' => $contract['id'], 'signing_timer' => 1, ]); + if(!$updateLocalRes || $updateSverRes['code']==0){ + return json(['success' => false, 'msg' => '更新失败']); + } }else if($contract['signing_timer'] == 1) { + $vehicle = json_decode($contract['cars_info'],true); + if(empty($vehicle)){ + return json(['success' => false, 'msg' => '更新失败']); + } //更新本地合同状态 Contract::where('id',$params['id'])->update(['signing_timer'=>2,'status'=>3]); - //更新远程 + //更新本地车辆状态 Vehicle::where('id','in',array_column($vehicle,'id'))->update(['status'=>2]); $data = []; foreach($vehicle as $v){ diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php index 66933d48..2ebac2df 100644 --- a/app/api/controller/JunziqianController.php +++ b/app/api/controller/JunziqianController.php @@ -183,7 +183,7 @@ class JunziqianController extends BaseApiController $request->serverCa = 1; //是否需要服务端云证书 $request->fileType = 3; $request->htmlContent = $data['content']; - $request->notifyUrl = 'https://worker-task.lihaink.cn/notify_url?id=' . $id; + $request->notifyUrl = $this->domain.'/api/index/notifyUrl?id='.$id; $request->needQifengSign = 1; //发起PING请求