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

p

Browse Source
This commit is contained in:
unknown 2023-08-24 16:17:33 +08:00
parent eaa8b601c4
commit 4e5a3f84fc
4 changed files with 7 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/api/controller/VehicleController.php
View File

@ -27,15 +27,11 @@ class VehicleController extends BaseApiController
public function setContract():Json {
//获取参数
$params = $this->request->post(['party_a','party_b','num','start_time','end_time','rent_type','car_id']);
$params = $this->request->post(['party_a','party_b','num','rent_type','car_id']);
//验证参数
if(empty($params['party_a']) || empty($params['party_b']) || empty($params['num']) || empty($params['start_time']) || empty($params['end_time']) || empty($params['rent_type'])){
if(empty($params['party_a']) || empty($params['party_b']) || empty($params['num']) || empty($params['rent_type'])){
return $this->fail('缺少必要的参数');
}
//验证时间格式
if(!checkDateIsValid($params['start_time']) || !checkDateIsValid($params['end_time'])){
return $this->fail('时间格式错误');
}
if(!in_array($params['rent_type'],[1,2])){
return $this->fail('rent_type数据格式错误');
}

19
app/api/logic/VehicleLogic.php
View File

@ -87,8 +87,6 @@ class VehicleLogic extends BaseLogic
'party_a' => $params['party_a'],
'party_b' => $params['party_b'],
'num' => $params['num'],
'start_time' => strtotime($params['start_time']),
'end_time' => strtotime($params['end_time']),
'rent_type' => $params['rent_type'],
'status' => 1,
'create_time' => time(),
@ -103,7 +101,7 @@ class VehicleLogic extends BaseLogic
}
public static function rendRecordInfo($contract_id):array {
$record = VehicleRentRecord::field('car_ids,num,start_time,end_time')->where('contract_id',$contract_id)->find();
$record = VehicleRentRecord::field('car_ids,num,create_time')->where('contract_id',$contract_id)->find();
if(!$record){
return ['code'=>0,'msg'=>'数据不存在'];
}
@ -114,9 +112,8 @@ class VehicleLogic extends BaseLogic
$car_license = array_column($cars->toArray(),'license');
$data = [
'num' => $record['num'],
'start_time' => $record['start_time'],
'end_time' => $record['end_time'],
'car_license' => $car_license
'car_license' => $car_license,
'create_time' => $record['create_time']
];
return ['code'=>1,'msg'=>'请求成功','data'=>$data];
}
@ -145,8 +142,7 @@ class VehicleLogic extends BaseLogic
'lessee_one_user_id' => $company['user_id'],
'lessee_one_user' => $company['master_name'],
'lessee_one_phone' => $company['master_phone'],
'lessee_one_start_time' => strtotime($record['start_time']),
'lessee_one_end_time' => strtotime($record['end_time']),
'lessee_one_start_time' => strtotime($record['create_time']),
'lessee_one_flag' => 1,
];
}
@ -160,10 +156,6 @@ class VehicleLogic extends BaseLogic
if(!$rent){
return ['code'=>0,'msg'=>'未找到车辆信息'];
}
//判断租赁时间
if(strtotime($record['start_time']) < strtotime($rent['lessee_one_start_time']) || strtotime($record['end_time']) > strtotime($rent['lessee_one_end_time'])){
return ['code'=>0,'msg'=>'租赁时间超出范围'];
}
//获取第二承租方公司信息
$company = Company::field('id,user_id,company_name,master_name,master_phone')->where('id',$record['party_b'])->find();
//验证公司信息
@ -179,8 +171,7 @@ class VehicleLogic extends BaseLogic
'lessee_two_user_id' => $company['user_id'],
'lessee_two_user' => $company['master_name'],
'lessee_two_phone' => $company['master_phone'],
'lessee_two_start_time' => strtotime($record['start_time']),
'lessee_two_end_time' => strtotime($record['end_time']),
'lessee_two_start_time' => strtotime($record['create_time']),
'lessee_two_flag' => 1,
];
//写入数据

16
app/common/model/vehicle/VehicleRent.php
View File

@ -14,14 +14,6 @@ class VehicleRent extends BaseModel
return date('Y-m-d',$value);
}
public function getLesseeOneEndTimeAttr($value): string
{
if(empty($value)){
return 0;
}
return date('Y-m-d',$value);
}
public function getLesseeTwoStartTimeAttr($value): string
{
if(empty($value)){
@ -29,12 +21,4 @@ class VehicleRent extends BaseModel
}
return date('Y-m-d',$value);
}
public function getLesseeTwoEndTimeAttr($value): string
{
if(empty($value)){
return 0;
}
return date('Y-m-d',$value);
}
}

16
app/common/model/vehicle/VehicleRentRecord.php
View File

@ -6,22 +6,6 @@ use app\common\model\BaseModel;
class VehicleRentRecord extends BaseModel
{
public function getStartTimeAttr($value): string
{
if(empty($value)){
return 0;
}
return date('Y-m-d',$value);
}
public function getEndTimeAttr($value): string
{
if(empty($value)){
return 0;
}
return date('Y-m-d',$value);
}
public function getCreateTimeAttr($value): string
{
if(empty($value)){