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

更新

Browse Source
This commit is contained in:
mkm 2023-09-02 20:01:59 +08:00
parent 28e635401b
commit 959b241975
6 changed files with 107 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,8 +197,9 @@ class CompanyController extends BaseAdminController
];
$res = app(JunziqianController::class)->EnterpriseCertification($data);
if ($res->success == true) {
Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data]);
return $this->success('系统认证中，请稍后刷新页面查看', ['email' => $res->data], 1, 1);
Db::name('company')->where('id', $params['id'])->update(['master_email' => $res->data,'is_authentication'=>1]);
return $this->success('认证成功',[],1, 1);
// return $this->success('系统认证中，请稍后刷新页面查看', ['email' => $res->data], 1, 1);
} else {
return $this->fail($res->msg);
}

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

@ -30,7 +30,7 @@ use think\response\Json;
*/
class IndexController extends BaseApiController
{
public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl','notifyProperty','notifyAuthentication','notifyVehicleContractUpdate','systemCarRent','selfCarRent','cancelRent'];
public array $notNeedLogin = ['index', 'config', 'policy', 'decorate', 'notifyUrl', 'notifyProperty', 'notifyAuthentication', 'notifyVehicleContractUpdate', 'systemCarRent', 'selfCarRent', 'cancelRent'];
private $domain = 'https://logistics.lihaink.cn';
@ -61,9 +61,9 @@ class IndexController extends BaseApiController
*/
public function config()
{
$parmas=$this->request->param();
$group_id=$this->userInfo?$this->userInfo['group_id']:1;
$result = IndexLogic::getConfigData($group_id,$parmas);
$parmas = $this->request->param();
$group_id = $this->userInfo ? $this->userInfo['group_id'] : 1;
$result = IndexLogic::getConfigData($group_id, $parmas);
return $this->data($result);
}
@ -121,44 +121,45 @@ class IndexController extends BaseApiController
}
//系统车辆租赁回来
public function systemCarRent() {
public function systemCarRent()
{
//获取参数
$id = $this->request->get('id');
if(empty($id)){
if (empty($id)) {
return json(['success' => false, 'msg' => '失败1.1']);
}
//获取合同数据
$contract = VehicleContract::where('id',$id)->find();
if(empty($contract)){
$contract = VehicleContract::where('id', $id)->find();
if (empty($contract)) {
return json(['success' => false, 'msg' => '失败1.2']);
}
if($contract['type'] != 0){
if ($contract['type'] != 0) {
return json(['success' => false, 'msg' => '失败1.3']);
}
if($contract['status'] != 2){
if ($contract['status'] != 2) {
return json(['success' => false, 'msg' => '失败1.4']);
}
//判断签约方
if ($contract['signing_timer'] == 0) {
//更新合同的签约次数
$res = VehicleContract::where('id',$id)->update(['signing_timer'=>1]);
if(!$res){
$res = VehicleContract::where('id', $id)->update(['signing_timer' => 1]);
if (!$res) {
return json(['success' => false, 'msg' => '失败1.5']);
}
return json(['success' => true, 'msg' => '成功']);
}else if($contract['signing_timer'] == 1) {
} else if ($contract['signing_timer'] == 1) {
//更改合同状态
VehicleContract::where('id',$id)->update(['signing_timer'=>2,'status'=>3]);
VehicleContract::where('id', $id)->update(['signing_timer' => 2, 'status' => 3]);
//添加车辆到租赁列表
$vehicle = json_decode($contract['cars_info'],true);
VehicleRent::where('car_id',$vehicle['id'])->update([
$vehicle = json_decode($contract['cars_info'], true);
VehicleRent::where('car_id', $vehicle['id'])->update([
'status' => 2,
'rent_time' => time(),
'rent_company_id' => $contract['company_b_id'],
]);
$party_b = Company::where('id',$contract['company_b_id'])->find();
$party_b = Company::where('id', $contract['company_b_id'])->find();
//通知物流系统跟新
curl_post($this->domain.'/api/updateVehicleRent',[],[
curl_post($this->domain . '/api/updateVehicleRent', [], [
'car_id' => $vehicle['id'],
'use_user_id' => $party_b['user_id'],
'use_user_name' => $party_b['master_name'],
@ -170,51 +171,52 @@ class IndexController extends BaseApiController
'type' => 1
]);
return json(['success' => true, 'msg' => '成功']);
}else{
} else {
return json(['success' => true, 'msg' => '成功']);
}
}
//自有车辆租赁回答
public function selfCarRent() {
public function selfCarRent()
{
//获取参数
$id = $this->request->get('id');
if(empty($id)){
if (empty($id)) {
return json(['success' => false, 'msg' => '失败2.1']);
}
//获取合同数据
$contract = VehicleContract::where('id',$id)->find();
if(empty($contract)){
$contract = VehicleContract::where('id', $id)->find();
if (empty($contract)) {
return json(['success' => false, 'msg' => '失败2.2']);
}
if($contract['type'] != 1){
if ($contract['type'] != 1) {
return json(['success' => false, 'msg' => '失败2.3']);
}
if($contract['status'] != 2){
if ($contract['status'] != 2) {
return json(['success' => false, 'msg' => '失败2.4']);
}
//判断签约方
if ($contract['signing_timer'] == 0) {
$res = VehicleContract::where('id',$id)->update(['signing_timer'=>1]);
if(!$res){
$res = VehicleContract::where('id', $id)->update(['signing_timer' => 1]);
if (!$res) {
return json(['success' => false, 'msg' => '失败2.5']);
}
return json(['success' => true, 'msg' => '成功']);
}else if($contract['signing_timer'] == 1) {
} else if ($contract['signing_timer'] == 1) {
//添加车辆到物流系统
$vehicle = json_decode($contract['cars_info'],true);
$curl_res = curl_post($this->domain.'/api/addSelfCar',[],[
'license'=>$vehicle['license'],
$vehicle = json_decode($contract['cars_info'], true);
$curl_res = curl_post($this->domain . '/api/addSelfCar', [], [
'license' => $vehicle['license'],
'company_id' => $contract['company_a_id'],
'company_name' => $contract['company_a_name'],
'company_user' => $contract['company_a_user'],
'company_phone' => $contract['company_a_phone'],
]);
if(!$curl_res || $curl_res['code'] == 0){
if (!$curl_res || $curl_res['code'] == 0) {
return json(['success' => false, 'msg' => '失败2.6']);
}
$cars_info = json_encode(['id'=>$curl_res['data']['car_id'],'license'=>$vehicle['license']]);
VehicleContract::where('id',$id)->update(['cars_info'=>$cars_info,'update_time'=>time(),'signing_timer'=>2,'status'=>3]);
$cars_info = json_encode(['id' => $curl_res['data']['car_id'], 'license' => $vehicle['license']]);
VehicleContract::where('id', $id)->update(['cars_info' => $cars_info, 'update_time' => time(), 'signing_timer' => 2, 'status' => 3]);
VehicleRent::create([
'car_id' => $curl_res['data']['car_id'],
'contract_id' => $contract['id'],
@ -227,9 +229,9 @@ class IndexController extends BaseApiController
'type' => 1
]);
$car_id = $curl_res['data']['car_id'];
$party_b = Company::where('id',$contract['company_b_id'])->find();
$party_b = Company::where('id', $contract['company_b_id'])->find();
//通知物流系统跟新
curl_post($this->domain.'/api/updateVehicleRent',[],[
curl_post($this->domain . '/api/updateVehicleRent', [], [
'car_id' => $car_id,
'use_user_id' => $party_b['user_id'],
'use_user_name' => $party_b['master_name'],
@ -241,76 +243,78 @@ class IndexController extends BaseApiController
'type' => 1
]);
return json(['success' => true, 'msg' => '成功']);
}else{
} else {
return json(['success' => true, 'msg' => '成功']);
}
}
//解除合同回调
public function cancelRent() {
public function cancelRent()
{
//获取参数
$id = $this->request->get('id');
if(empty($id)){
if (empty($id)) {
return json(['success' => false, 'msg' => '失败3.1']);
}
//获取合同数据
$contract = VehicleContract::where('id',$id)->find();
if(empty($contract)){
$contract = VehicleContract::where('id', $id)->find();
if (empty($contract)) {
return json(['success' => false, 'msg' => '失败3.2']);
}
if($contract['type'] != 2){
if ($contract['type'] != 2) {
return json(['success' => false, 'msg' => '失败3.3']);
}
if($contract['status'] != 2){
if ($contract['status'] != 2) {
return json(['success' => false, 'msg' => '失败3.4']);
}
if($contract['signing_timer'] == 0){
$res = VehicleContract::where('id',$id)->update(['signing_timer'=>1]);
if(!$res){
if ($contract['signing_timer'] == 0) {
$res = VehicleContract::where('id', $id)->update(['signing_timer' => 1]);
if (!$res) {
return json(['success' => false, 'msg' => '失败3.5']);
}
return json(['success' => true, 'msg' => '成功']);
}else if($contract['signing_timer'] == 1) {
} else if ($contract['signing_timer'] == 1) {
//更改合同状态
VehicleContract::where('id',$id)->update(['signing_timer'=>2,'status'=>3]);
VehicleContract::where('id', $id)->update(['signing_timer' => 2, 'status' => 3]);
//更改租赁列表车辆状态
$vehicle = json_decode($contract['cars_info'],true);
$vehicle = json_decode($contract['cars_info'], true);
//获取租赁车辆信息
$vehicleRentInfo = VehicleRent::where('car_id',$vehicle['id'])->find();
$vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find();
//更新原始合同类型
VehicleContract::where('id',$vehicleRentInfo['contract_id'])->update(['type'=>2]);
VehicleRent::where('car_id',$vehicle['id'])->update([
VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['type' => 2]);
VehicleRent::where('car_id', $vehicle['id'])->update([
'status' => 3,
]);
//通知物流系统跟新
curl_post($this->domain.'/api/cancelRent',[],[
curl_post($this->domain . '/api/cancelRent', [], [
'car_id' => $vehicle['id'],
'status' => 1
]);
return json(['success' => true, 'msg' => '成功']);
}else{
} else {
return json(['success' => true, 'msg' => '成功']);
}
}
//车辆租赁签约合同状态更改
public function notifyVehicleContractUpdate(){
if(!$this->request->isPost()){
public function notifyVehicleContractUpdate()
{
if (!$this->request->isPost()) {
return $this->fail('请求方式错误');
}
$param = $this->request->post();
if(empty($param['contract_logistic_id'])){
if (empty($param['contract_logistic_id'])) {
return $this->fail('缺少必要参数');
}
$model = VehicleContract::where('contract_logistic_id',$param['contract_logistic_id'])->find();
if(empty($model)){
$model = VehicleContract::where('contract_logistic_id', $param['contract_logistic_id'])->find();
if (empty($model)) {
return $this->fail('数据不存在');
}
$cars = json_decode($model['cars_info'],true);
$result = $model->where('id',$model['id'])->save($param);
if($result && isset($param['status']) && $param['status'] == 3){
$data= [];
foreach($cars as $k=>$v) {
$cars = json_decode($model['cars_info'], true);
$result = $model->where('id', $model['id'])->save($param);
if ($result && isset($param['status']) && $param['status'] == 3) {
$data = [];
foreach ($cars as $k => $v) {
$data[$k]['car_id'] = $v['id'];
$data[$k]['car_license'] = $v['license'];
$data[$k]['type'] = 0;
@ -319,7 +323,7 @@ class IndexController extends BaseApiController
$data[$k]['create_time'] = strtotime($model['create_time']);
}
$vehicleRent = new VehicleRent();
$vehicleRent -> saveAll($data);
$vehicleRent->saveAll($data);
}
//返回
return $result ? $this->success('更新成功') : $this->fail('更新失败');
@ -338,16 +342,16 @@ class IndexController extends BaseApiController
if (!isset($parmas['object_id'])) {
return json(['success' => false, 'msg' => '对象id不能为空']);
}
$data=[];
$object_id = explode(',',$parmas['object_id']);
foreach($object_id as $k=>$v){
if($v>0){
$data[$k]['company_id']=$parmas['company_id'];
$data[$k]['object_id']=$v;
$data[$k]['type']=1;
$data = [];
$object_id = explode(',', $parmas['object_id']);
foreach ($object_id as $k => $v) {
if ($v > 0) {
$data[$k]['company_id'] = $parmas['company_id'];
$data[$k]['object_id'] = $v;
$data[$k]['type'] = 1;
}
}
if (count($data)<=0){
if (count($data) <= 0) {
return json(['success' => false, 'msg' => '失败']);
}
$res = CompanyProperty::insertAll($data);
@ -366,12 +370,18 @@ class IndexController extends BaseApiController
public function notifyAuthentication()
{
$parmas = Request()->param();
Log::error('notifyAuthentication', $parmas);
if ($parmas) {
Company::where('id',$parmas['id'])->update(['is_authentication'=>1]);
return json(['success' => true, 'msg' => '成功']);
Log::error($parmas);
try {
Log::error('notifyAuthentication' . json_encode($parmas));
if ($parmas) {
Company::where('id', $parmas['id'])->update(['is_authentication' => 1]);
return json(['success' => true, 'msg' => '成功']);
}
} catch (\Exception $e) {
Log::error($e->getMessage());
}
return json(['success' => false, 'msg' => '失败,没有参数']);
}
}

11
app/api/controller/JunziqianController.php
View File

@ -21,7 +21,12 @@ class JunziqianController extends BaseApiController
private $appkey = '3121e0d911b7943d';
/**secret*/
private $appSecret = '1e66d8b73121e0d911b7943d82bba174';
/**请求地址*/
// private $serviceUrl = 'https://api.junziqian.com';
// /**appkey*/
// private $appkey = '62dc4ab579153712';
// /**secret*/
// private $appSecret = 'b7f65acc62dc4ab579153712fc9ebfc5';
/**默认加密方式:不输入使用sha256,其它可选择项md5,sha1,sha3-256*/
private $encryMethod;
/**默认ts单位:1毫秒,2秒*/
@ -74,7 +79,9 @@ class JunziqianController extends BaseApiController
if (isset($data['master_email'])) {
$request->emailOrMobile = $data['master_email']; //邮箱
}
$request->notifyUrl = env('url.url_prefix').'/notify_authentication?id=' . $data['id'];
// $request->notifyUrl = env('url.url_prefix').'/notifyAuthentication?ids=22222';
$request->notifyUrl = env('url.url_prefix').'/notifyAuthentication?id='.$data['id'];
// halt($request);
//发起创建企业请求
$response = $requestUtils->doPost("/v2/user/organizationCreate", $request);
return $response;

4
app/common/logic/CompanyLogic.php
View File

@ -246,9 +246,9 @@ class CompanyLogic extends BaseLogic
$data['responsible_area'] = explode(',', $data['responsible_area']);
$where[]=['party_b','=', $data['id']];
if(isset($params['contract_type'])){
$wehre[]=['contract_type','=',$params['contract_type']];
$where[]=['contract_type','=',$params['contract_type']];
}
$data['contract'] = Contract::where($wehre)->with(['party_a_info', 'contractType'])->find();
$data['contract'] = Contract::where($where)->with(['party_a_info', 'contractType'])->find();
}
return $data;

4
extend/junziqian/sdk/util/RequestUtils.php
View File

@ -5,6 +5,8 @@ namespace junziqian\sdk\util;
use junziqian\sdk\util\exception\ResultInfoException;
use junziqian\sdk\util\http\HttpClientUtils;
use think\facade\Log;
/**
* Class RequestUtils http请求
* @package com\junziqian\sdk\bean
@ -60,7 +62,9 @@ class RequestUtils{
throw new ResultInfoException("不支持的请求req");
}
$req=$this->fillSign($req);
// Log::error([$url,json_encode($req)]);
//请求服务端sass
// halt($url,$req);
//print_r(CommonUtil::json_encode($req));
$response= HttpClientUtils::getPost($url,$req);
$res=json_decode($response);

2
route/app.php
View File

@ -35,5 +35,5 @@ Route::rule('crontab', function () {
});
Route::post('/notify_url', IndexController::class . '@notifyUrl');
Route::post('/notify_authentication',IndexController::class . '@notifyAuthentication');
Route::post('/notifyAuthentication',IndexController::class . '@notifyAuthentication');
Route::get('/api/junziqian/download_file',JunziqianController::class . '@download_file');