|  | @@ -96,27 +96,19 @@ class Preorder extends Apic
 | 
	
		
			
				|  |  |              'servicetype_id','server_time','server_info','server_images','pay_fee'
 | 
	
		
			
				|  |  |          ]);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -        //检查用户
 | 
	
		
			
				|  |  | -        $user_info = Db::name('user')->where('mobile',$data['user_mobile'])->find();
 | 
	
		
			
				|  |  | -        if(empty($user_info)){
 | 
	
		
			
				|  |  | -            $this->error('不存在的用户,请先让客户扫店铺码注册');
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -        $data['user_id'] = $user_info['id'];
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  |          //预约单
 | 
	
		
			
				|  |  | -        $pre_order = [];
 | 
	
		
			
				|  |  |          if($pre_order_id > 0){
 | 
	
		
			
				|  |  | +            //check
 | 
	
		
			
				|  |  |              $map = ['id'=>$pre_order_id,'company_id'=>$this->auth->company_id,'pre_order_status'=>1];
 | 
	
		
			
				|  |  |              $pre_order = Db::name('pre_order')->where($map)->find();
 | 
	
		
			
				|  |  |              if(empty($pre_order)){
 | 
	
		
			
				|  |  |                  $this->error('不存在的预约单');
 | 
	
		
			
				|  |  | -            }else{
 | 
	
		
			
				|  |  | -                $data['pre_order_id'] = $pre_order_id;
 | 
	
		
			
				|  |  | -                //数据一致性
 | 
	
		
			
				|  |  | -                if($pre_order['user_id'] != $data['user_id']){
 | 
	
		
			
				|  |  | -                    $this->error('预约单用户非当前用户');
 | 
	
		
			
				|  |  | -                }
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +            $data['pre_order_id'] = $pre_order_id;
 | 
	
		
			
				|  |  | +            $data['user_id'] == $pre_order['user_id'];
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |              //修改状态
 | 
	
		
			
				|  |  |              $update = [
 | 
	
		
			
				|  |  |                  'order_time'   => time(),
 | 
	
	
		
			
				|  | @@ -126,6 +118,13 @@ class Preorder extends Apic
 | 
	
		
			
				|  |  |              Db::name('pre_order')->where('id',$pre_order_id)->update($update);
 | 
	
		
			
				|  |  |          }else{
 | 
	
		
			
				|  |  |              $data['pre_order_id'] = 0;
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +            //检查用户
 | 
	
		
			
				|  |  | +            $user_info = Db::name('user')->where('mobile',$data['user_mobile'])->find();
 | 
	
		
			
				|  |  | +            if(empty($user_info)){
 | 
	
		
			
				|  |  | +                $this->error('不存在的用户,请先让客户扫店铺码注册');
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  | +            $data['user_id'] = $user_info['id'];
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          //检索car_id,没必要了
 |