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

Merge pull request 'update' (#95) from zhangwei into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/95
This commit is contained in:
wei1990 2023-09-01 14:59:52 +08:00
commit 07e7251d62
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,10 +30,9 @@ use think\response\Json;
*/ */
class IndexController extends BaseApiController class IndexController extends BaseApiController
{ {
public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl','notifyProperty','notifyAuthentication','notifyVehicleContractUpdate','systemCarRent','selfCarRent','cancelContract']; public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl','notifyProperty','notifyAuthentication','notifyVehicleContractUpdate','systemCarRent','selfCarRent','cancelRent'];
private $domain = 'https://logistics.lihaink.cn'; private $domain = 'https://logistics.lihaink.cn';
// private $domain = 'http://www.lst.local';
/** /**
* @notes 首页数据 * @notes 首页数据
@ -156,10 +155,18 @@ class IndexController extends BaseApiController
'rent_time' => time(), 'rent_time' => time(),
'rent_company_id' => $contract['company_b_id'], 'rent_company_id' => $contract['company_b_id'],
]); ]);
$party_b = Company::where('id',$contract['company_b_id'])->find();
//通知物流系统跟新 //通知物流系统跟新
curl_post($this->domain.'/api/cancelRent',[],[ curl_post($this->domain.'/api/updateVehicleRent',[],[
'car_id' => $vehicle['id'], 'car_id' => $vehicle['id'],
'status' => 1 'use_user_id' => $party_b['user_id'],
'use_user_name' => $party_b['master_name'],
'use_user_phone' => $party_b['master_phone']
]);
CompanyProperty::create([
'company_id' => $contract['company_b_id'],
'object_id' => $vehicle['id'],
'type' => 1
]); ]);
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);
}else{ }else{
@ -239,7 +246,7 @@ class IndexController extends BaseApiController
} }
//解除合同回调 //解除合同回调
public function cancelContract() { public function cancelRent() {
//获取参数 //获取参数
$id = $this->request->get('id'); $id = $this->request->get('id');
if(empty($id)){ if(empty($id)){
@ -270,6 +277,11 @@ class IndexController extends BaseApiController
VehicleRent::where('car_id',$vehicle['id'])->update([ VehicleRent::where('car_id',$vehicle['id'])->update([
'status' => 3, 'status' => 3,
]); ]);
//通知物流系统跟新
curl_post($this->domain.'/api/cancelRent',[],[
'car_id' => $vehicle['id'],
'status' => 1
]);
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);
}else{ }else{
return json(['success' => true, 'msg' => '成功']); return json(['success' => true, 'msg' => '成功']);