fix

Home/Lib/Action/ApiAction.class.php

@@ -201,97 +201,99 @@ class ApiAction extends Action {
  
 	public  function reportPersonalOrderInfo(  ){
 		header('Access-Control-Allow-Origin:*');
-		$data = $_POST;
-		$appid = $data['AppId'];
-		if(!$appid){
-			json_fail('AppId不存在!');
-		}
-		$appkey = $data['AppKey'];
-		if(!$appkey){
-			json_fail('AppKey不存在!');
-		}
-		$token = $data['Token'];
-		if(!$token){
-			json_fail('Token不存在!');
-		}
-		$timestamp = $data['Timestamp'];
-		if(!$timestamp){
-			json_fail('Timestamp不存在!');
-		}
-		$random = $data['Random'];
-		if(!$random){
-			json_fail('Random不存在!');
-		}
-		$this->token_verify($appkey,$timestamp,$random,$token);
-		if(!$data['FullName']){
-			json_fail('用户名不存在!');
-		}
-		if(!$data['Sex']){
-			json_fail('用户性别不存在!');
-		}
-		if(!$data['UserPhone']){
-			json_fail('用户手机号不存在!');
-		}
-		if(!$data['IdCard']){
-			json_fail('用户身份证不存在!');
-		}
-		if(!$data['DetailedAdd']){
-			json_fail('用户地址不存在!');
-		}
-		if(!$data['PlaceId']){
-			json_fail('备案点不存在!');
-		}
-		if(!$data['InstallDate']){
-			json_fail('安装日期不存在!');
-		}
-		if(!$data['OrderType']){
-			json_fail('订单类型不存在!');
-		}
-		if(!$data['OpenId']){
-			json_fail('用户ID不存在!');
-		}
-		//获取备案点信息
-		$place_message = M('yhgl_kh_places')->where(array('ID'=>$data['PlaceId']))->field('RegPointName,PersonInCharge,ResPhone,Address,Latitude,Longitude')->find();
-		//获取订单号
-		$ordernumber = $this->setOrderNumber();
-		//检测车牌是否存在
-		if(!$data['LicensePlate']){
-					$data['ID'] = create_guid();
-					$data['OrderNumber'] = $ordernumber;
-					$data['OrderStatus'] = 0;
-					$data['AddTime'] = date('Y-m-d H:i:s');
-					$data['EffectiveDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
-					$data['ExpireDate'] = date("Y-m-d",strtotime("+".(C('WJW.DELIVERY_TIME')+C('WJW.EXPIRATION_DATE'))." day"));
-			$res = M('jms_order')->createAdd($data);
-			if(!$res){
-				json_fail('订单信息添加失败!');
-			}
-			$place_message['OrderNumber'] = $ordernumber;
-			json_success('操作成功',$place_message);
-		}else{
-			$order_num = M('jms_order')->where(array('LicensePlate'=>$data['LicensePlate'],'OrderStatus'=>array('neq','2')))->count();
-			//判断订单状态,过期重新开户
-			if(!$order_num){
-					$data['ID'] = create_guid();
-					$data['OrderNumber'] = $ordernumber;
-					$data['OrderStatus'] = 0;
-					$data['AddTime'] = date('Y-m-d H:i:s');
-					$data['LicensePlate'] = $data['LicensePlate'];
-					$data['EffectiveDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
-					$data['ExpireDate'] = date("Y-m-d",strtotime("+".(C('WJW.DELIVERY_TIME')+C('WJW.EXPIRATION_DATE'))." day"));
-				$res = M('jms_order')->createAdd($data);
-				if(!$res){
-					json_fail('订单信息保存失败!');
+				$data = $_POST;
+				$appid = $data['AppId'];
+				if(!$appid){
+					json_fail('AppId不存在!');
 				}
-				$place_message['OrderNumber'] = $ordernumber;
-				json_success('操作成功',$place_message);
-			}else{
-				json_fail('订单信息已经存在');
-			}
-		}
-		
-		
-		
+				$appkey = $data['AppKey'];
+				if(!$appkey){
+					json_fail('AppKey不存在!');
+				}
+				$token = $data['Token'];
+				if(!$token){
+					json_fail('Token不存在!');
+				}
+				$timestamp = $data['Timestamp'];
+				if(!$timestamp){
+					json_fail('Timestamp不存在!');
+				}
+				$random = $data['Random'];
+				if(!$random){
+					json_fail('Random不存在!');
+				}
+				$this->token_verify($appkey,$timestamp,$random,$token);
+				if(!$data['FullName']){
+					json_fail('用户名不存在!');
+				}
+				if(!$data['Sex']){
+					json_fail('用户性别不存在!');
+				}
+				if(!$data['UserPhone']){
+					json_fail('用户手机号不存在!');
+				}
+				if(!$data['IdCard']){
+					json_fail('用户身份证不存在!');
+				}
+				if(!$data['DetailedAdd']){
+					json_fail('用户地址不存在!');
+				}
+				if(!$data['PlaceId']){
+					json_fail('备案点不存在!');
+				}
+				if(!$data['OrderType']){
+					json_fail('订单类型不存在!');
+				}
+				if(!$data['OpenId']){
+					json_fail('用户ID不存在!');
+				}
+				//获取备案点信息
+				$place_message = M('yhgl_kh_places')->where(array('ID'=>$data['PlaceId']))->field('RegPointName,PersonInCharge,ResPhone,Address,Latitude,Longitude')->find();
+				//获取订单号
+				$ordernumber = $this->setOrderNumber();
+				//检测车牌是否存在
+				if(!$data['LicensePlate']){
+							$data['ID'] = create_guid();
+							$data['OrderNumber'] = $ordernumber;
+							$data['OrderStatus'] = 0;
+							$data['AddTime'] = date('Y-m-d H:i:s');
+							$data['EffectiveDate'] = date("Y-m-d");//开始日期
+							$data['ExpireDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));//过期日期
+					$res = M('jms_order')->createAdd($data);
+					if(!$res){
+						json_fail('订单信息添加失败!');
+					}
+					$place_message['OrderNumber'] = $ordernumber;
+					$place_message['EffectiveDate'] = $data['EffectiveDate'];
+						$place_message['ExpireDate'] = $data['ExpireDate'];
+					json_success('操作成功',$place_message);
+				}else{
+					$order_num = M('jms_order')->where(array('LicensePlate'=>$data['LicensePlate'],'OrderStatus'=>array('neq','2')))->count();
+					//判断订单状态,过期重新开户
+					if(!$order_num){
+							$data['ID'] = create_guid();
+							$data['OrderNumber'] = $ordernumber;
+							$data['OrderStatus'] = 0;
+							$data['AddTime'] = date('Y-m-d H:i:s');
+							$data['LicensePlate'] = $data['LicensePlate'];
+							$data['EffectiveDate'] = date("Y-m-d",time());//开始日期
+							$data['ExpireDate'] =date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));//过期日期
+						$res = M('jms_order')->createAdd($data);
+						if(!$res){
+							json_fail('订单信息保存失败!');
+						}
+						$place_message['OrderNumber'] = $ordernumber;
+						$place_message['LicensePlate'] = $data['LicensePlate'];
+						$place_message['EffectiveDate'] = $data['EffectiveDate'];
+						$place_message['ExpireDate'] = $data['ExpireDate'];
+						json_success('操作成功',$place_message);
+					}else{
+						json_fail('订单信息已经存在');
+					}
+				}
+				
+				
+				
 	}
 	
  
@@ -328,92 +330,96 @@ class ApiAction extends Action {
  
 	public  function reportCompanyOrderInfo(  ){
 		header('Access-Control-Allow-Origin:*');
-		$data = $_POST;
-		$appid = $data['AppId'];
-		if(!$appid){
-			json_fail('AppId不存在!');
-		}
-		$appkey = $data['AppKey'];
-		if(!$appkey){
-			json_fail('AppKey不存在!');
-		}
-		$token = $data['Token'];
-		if(!$token){
-			json_fail('Token不存在!');
-		}
-		$timestamp = $data['Timestamp'];
-		if(!$timestamp){
-			json_fail('Timestamp不存在!');
-		}
-		$random = $data['Random'];
-		if(!$random){
-			json_fail('Random不存在!');
-		}
-		$this->token_verify($appkey,$timestamp,$random,$token);
-		if(!$data['FullName']){
-			json_fail('用户名不存在!');
-		}
-		if(!$data['Sex']){
-			json_fail('用户性别不存在!');
-		}
-		if(!$data['UserPhone']){
-			json_fail('用户手机号不存在!');
-		}
-		if(!$data['IdCard']){
-			json_fail('用户身份证不存在!');
-		}
-		if(!$data['DetailedAdd']){
-			json_fail('用户地址不存在!');
-		}
-		if(!$data['PlaceId']){
-			json_fail('备案点不存在!');
-		}
-		if(!$data['CompanyId']){
-			json_fail('公司ID不存在!');
-		}
-		//获取备案点信息
-		$place_message = M('yhgl_kh_places')->where(array('ID'=>$data['PlaceId']))->field('RegPointName,PersonInCharge,ResPhone,Address,Latitude,Longitude')->find();
-		//获取订单号
-		$ordernumber = $this->setOrderNumber();
-		//检测车牌是否存在
-		if(!$data['LicensePlate']){
-					$data['ID'] = create_guid();
-					$data['InstallDate'] = date('Y-m-d');
-					$data['OrderType'] = 2;
-					$data['OrderNumber'] = $ordernumber;
-					$data['OrderStatus'] = 0;
-					$data['AddTime'] = date('Y-m-d H:i:s');
-					$data['EffectiveDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
-					$data['ExpireDate'] = date("Y-m-d",strtotime("+".(C('WJW.DELIVERY_TIME')+C('WJW.EXPIRATION_DATE'))." day"));
-			$res = M('jms_order')->createAdd($data);
-			if(!$res){
-				json_fail('订单信息添加失败!');
-			}
-			$place_message['OrderNumber'] = $ordernumber;
-			json_success('操作成功',$place_message);
-		}else{
-			$order_num = M('jms_order')->where(array('LicensePlate'=>$data['LicensePlate'],'OrderStatus'=>array('neq','2')))->count();
-			//判断订单状态,过期重新开户
-			if(!$order_num){
-					$data['ID'] = create_guid();
-					$data['InstallDate'] = date('Y-m-d');
-					$data['OrderType'] = 2;
-					$data['OrderNumber'] = $ordernumber;
-					$data['OrderStatus'] = 0;
-					$data['AddTime'] = date('Y-m-d H:i:s');
-					$data['LicensePlate'] = $data['LicensePlate'];
-					$data['EffectiveDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
-					$data['ExpireDate'] = date("Y-m-d",strtotime("+".(C('WJW.DELIVERY_TIME')+C('WJW.EXPIRATION_DATE'))." day"));
-				$res = M('jms_order')->createAdd($data);
-				if(!$res){
-					json_fail('订单信息保存失败!');
+				$data = $_POST;
+				$appid = $data['AppId'];
+				if(!$appid){
+					json_fail('AppId不存在!');
+				}
+				$appkey = $data['AppKey'];
+				if(!$appkey){
+					json_fail('AppKey不存在!');
+				}
+				$token = $data['Token'];
+				if(!$token){
+					json_fail('Token不存在!');
+				}
+				$timestamp = $data['Timestamp'];
+				if(!$timestamp){
+					json_fail('Timestamp不存在!');
+				}
+				$random = $data['Random'];
+				if(!$random){
+					json_fail('Random不存在!');
+				}
+				$this->token_verify($appkey,$timestamp,$random,$token);
+				if(!$data['FullName']){
+					json_fail('用户名不存在!');
+				}
+				if(!$data['Sex']){
+					json_fail('用户性别不存在!');
+				}
+				if(!$data['UserPhone']){
+					json_fail('用户手机号不存在!');
+				}
+				if(!$data['IdCard']){
+					json_fail('用户身份证不存在!');
+				}
+				if(!$data['DetailedAdd']){
+					json_fail('用户地址不存在!');
+				}
+				if(!$data['PlaceId']){
+					json_fail('备案点不存在!');
+				}
+				if(!$data['CompanyId']){
+					json_fail('公司ID不存在!');
+				}
+				//获取备案点信息
+				$place_message = M('yhgl_kh_places')->where(array('ID'=>$data['PlaceId']))->field('RegPointName,PersonInCharge,ResPhone,Address,Latitude,Longitude')->find();
+				//获取订单号
+				$ordernumber = $this->setOrderNumber();
+				//检测车牌是否存在
+				if(!$data['LicensePlate']){
+							$data['ID'] = create_guid();
+							$data['InstallDate'] = date('Y-m-d');
+							$data['OrderType'] = 2;
+							$data['OrderNumber'] = $ordernumber;
+							$data['OrderStatus'] = 0;
+							$data['AddTime'] = date('Y-m-d H:i:s');
+							$data['EffectiveDate'] = date("Y-m-d");
+							$data['ExpireDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
+					$res = M('jms_order')->createAdd($data);
+					if(!$res){
+						json_fail('订单信息添加失败!');
+					}
+					$place_message['EffectiveDate'] =$data['EffectiveDate'];
+					$place_message['ExpireDate'] =$data['ExpireDate'];
+					$place_message['OrderNumber'] = $ordernumber;
+					json_success('操作成功',$place_message);
+				}else{
+					$order_num = M('jms_order')->where(array('LicensePlate'=>$data['LicensePlate'],'OrderStatus'=>array('neq','2')))->count();
+					//判断订单状态,过期重新开户
+					if(!$order_num){
+							$data['ID'] = create_guid();
+							$data['InstallDate'] = date('Y-m-d');
+							$data['OrderType'] = 2;
+							$data['OrderNumber'] = $ordernumber;
+							$data['OrderStatus'] = 0;
+							$data['AddTime'] = date('Y-m-d H:i:s');
+							$data['LicensePlate'] = $data['LicensePlate'];
+							$data['EffectiveDate'] = date("Y-m-d");
+							$data['ExpireDate'] = date("Y-m-d",strtotime("+".C('WJW.DELIVERY_TIME')." day"));
+						$res = M('jms_order')->createAdd($data);
+						if(!$res){
+							json_fail('订单信息保存失败!');
+						}
+						$place_message['OrderNumber'] = $ordernumber;
+						$place_message['EffectiveDate'] =$data['EffectiveDate'];
+					   $place_message['ExpireDate'] =$data['ExpireDate'];
+						json_success('操作成功',$place_message);
+					}else{
+						json_fail('订单信息已经存在');
+					}
 				}
-				$place_message['OrderNumber'] = $ordernumber;
-				json_success('操作成功',$place_message);
-			}else{
-				json_fail('订单信息已经存在');
-			}
-		}
 	}