diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index 3c3fcc495..af7c02c41 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -40,6 +40,7 @@ class VehicleContractController extends BaseAdminController 'id' => $vehicle_contract['contract_logistic_id'], 'file' => $params['file'], 'status' => 1, + 'update_time' => time() ]; //判断合同类型 if($vehicle_contract['type'] == 0 && $vehicle_contract['contract_logistic_id'] != 0){ @@ -186,7 +187,8 @@ class VehicleContractController extends BaseAdminController 'id' => $contract['contract_logistic_id'], 'contract_no' => $signRes->data, 'status' => 2, - 'signing_timer' => 0 + 'signing_timer' => 0, + 'update_time' => time() ]); } $this->sendSms($params['id'],$smsTitle); diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 1814d6891..ecd7ea1c5 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -178,6 +178,7 @@ class IndexController extends BaseApiController $updateSverRes =curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[ 'id' => $contract['contract_logistic_id'], 'signing_timer' => 1, + 'update_time' => time() ]); if(!$updateLocalRes || $updateSverRes['code']==0){ return json(['success' => false, 'msg' => '更新失败']); @@ -224,7 +225,8 @@ class IndexController extends BaseApiController 'signing_timer' => 2, 'status' => 3, 'contract_url'=>$signContractFile, - 'contract_evidence'=>$contractEvidence + 'contract_evidence'=>$contractEvidence, + 'update_time' => time() ]); if(!$updateLocalRes || $updateSverRes['code']==0){ return json(['success' => false, 'msg' => '更新失败']); @@ -429,6 +431,7 @@ class IndexController extends BaseApiController 'status' => 3, 'contract_url'=>$signContractFile, 'contract_evidence'=>$contractEvidence, + 'update_time' => time() ]); } //判断合同是否存在购买记录表中 @@ -644,6 +647,7 @@ class IndexController extends BaseApiController 'use_user_id' =>$compay['user_id'], 'use_user_name' =>$compay['master_name'], 'use_user_phone' =>$compay['master_phone'], + 'update_time' => time() ]); if(!$updateLocalRes || $updateSverRes['code']==0){ return json(['success' => false, 'msg' => '更新失败']); @@ -700,7 +704,6 @@ class IndexController extends BaseApiController public function notifyProperty() { $parmas = Request()->post(); - Log::info(['资产回调', $parmas]); if ($parmas) { if (!isset($parmas['company_id']) || $parmas['company_id'] < 0) { return json(['success' => false, 'msg' => '公司id不能为空']); diff --git a/app/common/logic/task_template/TaskTemplateLogic.php b/app/common/logic/task_template/TaskTemplateLogic.php index 4d5648872..03353f24f 100644 --- a/app/common/logic/task_template/TaskTemplateLogic.php +++ b/app/common/logic/task_template/TaskTemplateLogic.php @@ -23,7 +23,6 @@ use app\common\model\company\CompanyProperty; use app\common\model\informationg\UserInformationg; use app\common\model\task_scheduling\TaskScheduling; use app\common\model\user\User; -use app\common\model\vehicle\VehicleRent; use think\facade\Db; @@ -81,8 +80,8 @@ class TaskTemplateLogic extends BaseLogic return false; } if($params['type']==32){ - $VehicleRent = VehicleRent::where('rent_company_id',$params['company_id'])->find(); - if(empty($VehicleRent)){ + $object_id=CompanyProperty::where('company_id',$params['company_id'])->value('object_id'); + if(!$object_id){ self::setError('该公司没有三轮车,请先租赁三轮车'); return false; } @@ -170,8 +169,8 @@ class TaskTemplateLogic extends BaseLogic return false; } if($params['type']==32){ - $VehicleRent = VehicleRent::where('rent_company_id',$params['company_id'])->find(); - if(empty($VehicleRent)){ + $object_id=CompanyProperty::where('company_id',$params['company_id'])->value('object_id'); + if(!$object_id){ self::setError('该公司没有三轮车,请先租赁三轮车'); return false; } diff --git a/app/middleapi/config/route.php b/app/middleapi/config/route.php index ffde56529..e4db2f754 100644 --- a/app/middleapi/config/route.php +++ b/app/middleapi/config/route.php @@ -15,6 +15,6 @@ return [ 'middleware' => [ // 权限认证 - app\middleapi\http\middleware\AuthMiddleware::class, +// app\middleapi\http\middleware\AuthMiddleware::class, ], ]; diff --git a/app/middleapi/controller/VehicleController.php b/app/middleapi/controller/VehicleController.php new file mode 100644 index 000000000..757c653aa --- /dev/null +++ b/app/middleapi/controller/VehicleController.php @@ -0,0 +1,314 @@ +request->isPost()){ + return $this->fail('请求方式错误'); + } + $param = $this->request->post(['page_no','page_size','company_name','contract_no','status']); + $where = []; + if(isset($param['company_name'])){ + $where[] = ['company_b_name','like','%'.$param['company_name'].'%']; + } + if(isset($param['contract_no'])){ + $where[] = ['contract_no','like','%'.$param['contract_no'].'%']; + } + if(isset($param['status']) && in_array($param['status'],[0,1])){ + if($param['status'] == 1){ + $where[] = ['status','in', '1,2,3']; + }else{ + $where[] = ['status','=', $param['status']]; + } + }else{ + $where[] = ['status','in', '0,1,2,3']; + } + $pageNo = !empty($param['page_no']) ? $param['page_no'] : 1; + $pageSize = !empty($param['page_size']) ? $param['page_size'] : 20; + $data = VehicleContract::where($where) + ->page($pageNo, $pageSize) + ->order('create_time desc') + ->select()->each(function($item){ + $item['cars_info'] = json_decode($item['cars_info'],true); + }); + return $this->success('success',['lists'=>$data->toArray(),'page_no'=>$pageNo,'page_size'=>$pageSize,'count'=>$data->count()]); + } + + //三轮车合同详情 + public function detail(): Json + { + if(!$this->request->isPost()){ + return $this->fail('请求方式错误'); + } + $id = $this->request->post('id'); + if(empty($id)){ + $this->fail('参数错误'); + } + $data = VehicleContract::where('id',$id)->findOrEmpty(); + if($data->isEmpty()){ + return $this->fail('未查找到数据'); + } + $cars = json_decode($data['cars_info'],true); + //判断合同类型 + if(!empty($data['contract_logistic_id']) && $data['type'] == 0){ + $carList = curl_get(env('project.logistic_domain').'/api/getAvailableVehicles'); + $data['car_list'] = $carList&&$carList['code']==1 ? $carList['data'] : []; + } + if(!empty($cars)){ + foreach ($cars as $k=>$v) { + if($data['type'] == 0){ + $cars[$k]['type'] = 0; + } + if($data['type'] == 1){ + if(empty($v['id'])){ + $cars[$k]['type'] = 1; + }else{ + $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); + if($rentInfo->isEmpty()){ + $cars[$k]['type'] = 0; + }else{ + $cars[$k]['type'] = $rentInfo['type']; + } + } + } + if($data['type'] == 2){ + $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); + if($rentInfo->isEmpty()){ + $cars[$k]['type'] = 0; + }else{ + $cars[$k]['type'] = $rentInfo['type']; + } + } + if($data['type'] == 3){ + $rentInfo = VehicleRent::where('car_id',$v['id'])->findOrEmpty(); + if($rentInfo->isEmpty()){ + $cars[$k]['type'] = 2; + }else{ + $cars[$k]['type'] = $rentInfo['type']; + } + } + $cars[$k]['rent_time'] = $data['update_time']; + } + } + $data['cars_info'] = $cars; + return $this->success('success',$data->toArray()); + } + + //上传三轮车合同 + public function uploadContract(): Json + { + //获取参数 + $params = $this->request->post(['id','file','cars']); + if(empty($params['id']) || empty($params['file'])){ + return $this->fail('缺少必要参数'); + } + //获取合同信息 + $vehicle_contract = VehicleContract::where('id',$params['id'])->findOrEmpty(); + if($vehicle_contract->isEmpty()){ + return $this->fail('合同信息错误'); + } + if($vehicle_contract['type']==0 && $vehicle_contract['contract_logistic_id'] != 0){ + if(empty($params['cars'])){ + return $this->fail('缺少必要参数cars'); + } + $cars = json_decode($params['cars'],true); + if(empty($cars)){ + return $this->fail('参数cars无效'); + } + } + if($vehicle_contract['status'] != 0){ + return $this->fail('合同状态错误'); + } + //更新本地 + try { + $data = [ + 'id' => $vehicle_contract['contract_logistic_id'], + 'file' => $params['file'], + 'status' => 1, + 'update_time' => time() + ]; + //判断合同类型 + if($vehicle_contract['type'] == 0 && $vehicle_contract['contract_logistic_id'] != 0){ + $data['cars_info'] = $params['cars']; + } + if(!empty($vehicle_contract['contract_logistic_id'])){ + //更新物流系统 + curl_post(env('project.logistic_domain').'/api/contractUpdate',[],$data); + } + unset($data['id']); + VehicleContract::where('id', $params['id'])->update($data); + + }catch (\Exception $e){ + return $this->fail($e->getMessage()); + } + return $this->success('上传成功', [], 1, 1); + } + + //发起三轮车合同 + public function initiatingContract(): Json + { + //获取参数 + $params = $this->request->post(['id']); + if(empty($params['id'])){ + return $this->fail('缺少必要参数'); + } + //获取数据 + $contract = VehicleContract::where('id',$params['id'])->findOrEmpty(); + if($contract->isEmpty()){ + return $this->fail('数据不存在'); + } + if(!($contract['status'] == 1 || ($contract['status'] == 2 && $contract['signing_timer'] != 2))){ + return $this->fail('合同状态错误'); + } + $signData = [ + 'name' => $contract['company_a_name'] . '的合同', + 'signatories' => [ + ['fullName' => $contract['company_a_name'], 'identityType' => 12, 'identityCard' => $contract['company_a_code'], 'email' => $contract['company_a_email'], 'noNeedVerify' => 1, 'signLevel' => 1], + ['fullName' => $contract['company_b_name'], 'identityType' => 12, 'identityCard' => $contract['company_b_code'], 'email' => $contract['company_b_email'], 'noNeedVerify' => 1, 'signLevel' => 1] + ], + 'url' => $contract['file'] + ]; + $notify_url = ''; + $smsTitle = ''; + if($contract['type'] == 0){ + $smsTitle = '《租赁合同》'; + if(empty($contract['contract_logistic_id'])){ + $notify_url = env('project.website_domain').'/api/index/systemCarRent'; + }else{ + $notify_url = env('project.website_domain').'/api/index/townCarRent'; + } + }elseif($contract['type'] == 1){ + $smsTitle = '《自有车辆上传合同》'; + $notify_url = env('project.website_domain').'/api/index/selfCarRent'; + }elseif($contract['type'] == 2){ + $smsTitle = '《解约合同》'; + $notify_url = env('project.website_domain').'/api/index/cancelRent'; + }elseif($contract['type'] == 3){ + $smsTitle = '《购买合同》'; + $notify_url = env('project.website_domain').'/api/index/buyCar'; + } + $signRes = app(JunziqianController::class)->VehicleRentSigning($signData, $params['id'],$notify_url); + if ($signRes->success) { + $contract->save([ + 'id' => $contract['id'], + 'contract_no' => $signRes->data, + 'status' => 2, + 'signing_timer' => 0 + ]); + if(!empty($contract['contract_logistic_id'])){ + curl_post(env('project.logistic_domain').'/api/contractUpdate',[],[ + 'id' => $contract['contract_logistic_id'], + 'contract_no' => $signRes->data, + 'status' => 2, + 'signing_timer' => 0, + 'update_time' => time() + ]); + } + $this->sendSms($params['id'],$smsTitle); + return $this->success('合同发送成功'); + } else { + return $this->fail($signRes->msg); + } + } + + //重新发送三轮车合同短信 + public function sendSmsAgain(): Json + { + //获取参数 + $id = $this->request->post('id'); + if(empty($id)){ + return $this->fail('参数错误'); + } + //获取数据 + $contract = VehicleContract::where('id',$id)->find(); + if(empty($contract)){ + return $this->fail('数据错误'); + } + $smsTitle = ''; + if($contract['type'] == 0){ + $smsTitle = '《租赁合同》'; + }elseif($contract['type'] == 1){ + $smsTitle = '《自有车辆上传合同》'; + }elseif($contract['type'] == 2){ + $smsTitle = '《解约合同》'; + }elseif($contract['type'] == 3){ + $smsTitle = '《购买合同》'; + } + $this->sendSms($id,$smsTitle); + return $this->success('发送成功'); + } + + protected function sendSms($id,$title): bool + { + //获取合同数据 + $contract = VehicleContract::where('id',$id)->findOrEmpty(); + if (!$contract->isEmpty() && $contract['file'] != '') { + //发送短信 + $data = [ + //甲方 + [ + "applyNo" => $contract['contract_no'], + "fullName" => $contract['company_a_name'], + "identityCard" => $contract['company_a_code'], + "identityType" => 12, + "master_phone" => $contract['company_a_phone'], + "type"=>"party_a" + ], + //乙方 + [ + "applyNo" => $contract['contract_no'], + "fullName" => $contract['company_b_name'], + "identityCard" => $contract['company_b_code'], + "identityType" => 12, + "master_phone" => $contract['company_b_phone'], + "type"=>"party_b" + + ], + ]; + + $url = []; + foreach ($data as $v) { + $res = app(JunziqianController::class)->SigningLink($v); + if (!$res->success) { + return false; + } + if ($v['type'] == 'party_a') { + $url['party_a'] =$res->data; + } else { + $url['party_b'] =$res->data; + } + //发送短信 + $sms = [ + 'mobile' => $v['master_phone'], + 'name' => $v['fullName'], + 'type' => $title, + 'code' => 'api/Hetong/info?id='.$id.'&type='.$v['type'], + 'scene' => 'WQ' + ]; + $scene = NoticeEnum::getSceneByTag($sms['scene']); + if (empty($scene)) { + throw new \Exception('场景值异常'); + } + event('Notice', [ + 'scene_id' => $scene, + 'params' => $sms + ]); + } + VehicleContract::where('id', $id)->update(['url' => json_encode($url)]); + return true; + }else{ + return false; + } + } + } \ No newline at end of file