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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-10-19 10:59:28 +08:00
commit edd8d051f9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/controller/contract/VehicleContractController.php
View File

@ -144,7 +144,7 @@ class VehicleContractController extends BaseAdminController
if($contract->isEmpty()){ if($contract->isEmpty()){
return $this->fail('数据不存在'); return $this->fail('数据不存在');
} }
if($contract['status'] != 1){ if(!($contract['status'] == 1 || ($contract['status'] == 2 && $contract['signing_timer'] != 2))){
return $this->fail('合同状态错误'); return $this->fail('合同状态错误');
} }
$signData = [ $signData = [
@ -178,13 +178,15 @@ class VehicleContractController extends BaseAdminController
$contract->save([ $contract->save([
'id' => $contract['id'], 'id' => $contract['id'],
'contract_no' => $signRes->data, 'contract_no' => $signRes->data,
'status' => 2 'status' => 2,
'signing_timer' => 0
]); ]);
if(!empty($contract['contract_logistic_id'])){ if(!empty($contract['contract_logistic_id'])){
curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[ curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[
'id' => $contract['contract_logistic_id'], 'id' => $contract['contract_logistic_id'],
'contract_no' => $signRes->data, 'contract_no' => $signRes->data,
'status' => 2, 'status' => 2,
'signing_timer' => 0
]); ]);
} }
$this->sendSms($params['id'],$smsTitle); $this->sendSms($params['id'],$smsTitle);