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

Merge pull request 'reset' (#38) from zhangwei into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/38
This commit is contained in:
wei1990 2023-08-24 17:10:54 +08:00
commit 657c605dbc
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/adminapi/controller/CompanyController.php
View File

@ -140,11 +140,11 @@ class CompanyController extends BaseAdminController
} }
//判断是否是租赁合同 //判断是否是租赁合同
//如果是租赁合同则必须传递租赁数量参数 //如果是租赁合同则必须传递租赁数量参数
if($params['contract_type'] == 29) { // if($params['contract_type'] == 29) {
if(empty($params['num'])){ // if(empty($params['num'])){
return $this->fail('缺少必要参数'); // return $this->fail('缺少必要参数');
} // }
} // }
$params['type'] = 1; $params['type'] = 1;
$params['party_b'] = $params['id']; $params['party_b'] = $params['id'];
unset($params['id']); unset($params['id']);

16
app/common/logic/contract/ContractLogic.php
View File

@ -214,14 +214,14 @@ class ContractLogic extends BaseLogic
$model->setAttrs($data); $model->setAttrs($data);
$res = $model->save($data); $res = $model->save($data);
//如果是租赁合同，调用接口通知物流系统 //如果是租赁合同，调用接口通知物流系统
if($data['contract_type'] == 29){ // if($data['contract_type'] == 29){
curl_post('http://logistics.lihaink.cn/api/setContract',[],[ // curl_post('http://logistics.lihaink.cn/api/setContract',[],[
'party_a' => $data['party_a'], // 'party_a' => $data['party_a'],
'party_b' => $data['party_b'], // 'party_b' => $data['party_b'],
'num' => $data['num'], // 'num' => $data['num'],
'rent_type' => 1 // 'rent_type' => 1
]); // ]);
} // }
if($res){ if($res){
return ['code'=>1,'msg'=>'发起成功，等待平台风控部上传合同','data'=>['id'=>$model->id]]; return ['code'=>1,'msg'=>'发起成功，等待平台风控部上传合同','data'=>['id'=>$model->id]];
}else{ }else{