修改

.env

@@ -14,8 +14,8 @@ return array (
   'AUTH_APP_ID' => 'b4b3a9a3b3adc51824ccede12b2eaf5b',
   'AUTH_CODE' => '1F6D1B1402BC9DE8',
 
-  'WECHAT_APPID'=> 'wxb8e5ff9a626ca0a2',
-  'WECHAT_APPSECRET'=>'0368d4e599603b8a4b5f15b01ce4d6a6',
+  'WECHAT_APPID'=> 'wx63306b8ddb53c77c',
+  'WECHAT_APPSECRET'=>'c1d4f927d472894b8a9740163f595d9b',
 
   "KAFKA_BROKER_LIST" => "127.0.0.1",
   'ROUTE_INDEX_KAFKA_TOPIC' => 'rlstation_rfid_location',

.gitignore

@@ -0,0 +1,6 @@
+.env
+.debug
+.data/
+vendor/
+composer.lock
+workerman.pid

Home/Common/kq_funclib.php

@@ -857,4 +857,43 @@
 		return $response_data;
 	}
 	
+ 
+	function pb_abs_url( $url ){
+		if(strpos($url,'http://') === 0)
+			return $url;
+		if(strpos($url,'https://') === 0)
+			return $url;
+		return 'http://'.$_SERVER['HTTP_HOST'] . U($url);
+	}
+	
+ 
+	function hex2str( $hex ){
+		$string=""; 
+		for($i=0;$i<strlen($hex)-1;$i+=2)
+			$string.=chr(hexdec($hex[$i].$hex[$i+1]));
+		return  $string;
+	}
+	
+ 
+	function str2hex( $string ){
+		$hex="";
+		for($i=0;$i<strlen($string);$i++)
+			$hex.=dechex(ord($string[$i]));
+		$hex=strtoupper($hex);
+		return $hex;
+	}
+	
+ 
+	function wx_token_cache( $appid, $access_token, $expire_time ){
+		$key = 'access_token_'.$appid;
+		if(!$expire_time || $expire_time < 0)
+			$expire_time = 3600;
+		if($access_token){
+			S($key,$access_token,$expire_time);
+		}
+		else{
+			return S($key);
+		}
+	}
+	
 

Home/Lib/Action/CommonAction.class.php

@@ -0,0 +1,21 @@
+<?php
+
+
+
+class CommonAction extends Action {
+			
+
+
+ 
+	public  function _initialize(  ){
+		if(in_array(ACTION_NAME,array('wx_register') ))
+			return;	
+		$this->userid = \Jiaruan\UcCookie::get();
+		if(!$this->userid){
+			header('Location: ?s=uc_manage/login');
+		}
+		$this->user_info = M('uc_user')->where(['ID'=>$this->userid])->find();
+	}
+	
+
+}

Home/Lib/Action/WxApiAction.class.php

@@ -306,28 +306,25 @@ class WxApiAction extends Action {
 		if(!$res['status']){
 			json_fail($res['message']);
 		}
-		$list=M('devices')->where(array('user_id'=>$userid))->select();
+		
+		
+		//$vehiclesIds = M('vehicles')->where(['user_id' => $userid ])->getField('id',true);
+		
+		//$devices=M('devices')->where(['bind_id' =>array('in',$vehiclesIds) ])->select();
+		
+		$list=M('vehicles')->where(array('user_id'=>$userid))->select();
+		
 		$type_id=M('sys_dict_type')->where(['code'=>'DeviceType'])->getField('id');
-		$rela_type_id=M('sys_dict_type')->where(['code'=>'Relationships'])->getField('id');
+		
 		foreach($list as &$val){
-			$val['badge_user_info']=M("badgeuser")->where(['id'=>$val['badge_user_id']])->find();
-			$val['device_type']=M('sys_dict_data')->where(['type_id'=>$type_id,'code'=>$val['device_type']])->getField('value');
+		
+			$val['device_info']=M('devices')->where(['bind_id' =>$val['id']])->find();
 			$val['department_name']=M('departments')->where(['id'=>$val['department_id']])->getField('department_name');
-			if(!$val['device_name'] || $val['device_name']==null){
-				$val['device_name']='设备'.substr($val['imei'],-4);
-			}
-			$cond = ['device_id'=>$val['id']];
-			$res = M('kq_urgent')->where($cond)->select();
-			if($res){
-				foreach($res as &$item){
-					$item['relationship']=M('sys_dict_data')->where(['type_id'=>$rela_type_id,'code'=>$item['relationship']])->getField('value');
-				}
-				
-				$val['urgent_list']=$res;
-			}
+			$val['creator']=M('users')->where(['id'=>$val['creator_id']])->getField('username');
+		
 		}
 		if(!$list){
-			json_fail('暂无绑定设备');	
+			json_fail('暂无车辆');	
 		}
 		json_success('查询成功',$list);
 		
@@ -3444,5 +3441,93 @@ class WxApiAction extends Action {
 			
 	}
 	
+ 
+	public  function getMyInsureList(  ){
+		header('Access-Control-Allow-Origin: *');
+		$openid = I('get.openid'); 
+		$userid = I('get.userid');
+		
+		//检测登录状态
+		
+		$res=$this->checkLoginState($openid,$userid);
+		if(!$res['status']){
+			json_fail($res['message']);
+		}
+		
+		
+		$vehiclesIds = M('vehicles')->where(['user_id' => $userid ])->getField('id',true);
+		
+		$list=M('insure_records')->where(['vehicle_id' =>array('in',$vehiclesIds) ])->select();
+		
+		
+		foreach($list as &$val){
+			$start_at=strtotime(date('Y-m-d 00:00:00',$val['start_at']));
+			$end_at=strtotime(date('Y-m-d 23:59:59',$val['end_at']));
+			if(time()<$start_at){
+				$val['insure_state']=0;
+				$val['insure_state_text']='待生效';
+			}elseif(time()<=$end_at){
+				$val['insure_state']=1;
+				$val['insure_state_text']='生效中';
+			}else{
+				$val['insure_state']=2;
+				$val['insure_state_text']='已失效';
+			}
+			$val['vehicle_info']=M('vehicles')->where(['id' =>$val['vehicle_id']])->find();
+			$val['insure_info']=M('insurance')->where(['id' =>$val['insurance_id']])->find();
+			$val['start_at']=date('Y-m-d 00:00:00',$val['start_at']);
+			$val['end_at']=date('Y-m-d 23:59:59',$val['end_at']);
+		}
+		if(!$list){
+			json_fail('暂无保险');	
+		}
+		json_success('查询成功',$list);
+		
+	}
+	
+ 
+	public  function getInsureOptions(  ){
+		header('Access-Control-Allow-Origin: *');
+		
+		$list=M('insurance')->where(['enable' =>1])->field('*,name as text,id as value')->select();
+		foreach($list as &$val){
+			$val['price']=$val['price']*100;
+		}
+		json_success('查询成功',$list);
+		
+	}
+	
+ 
+	public  function userByInsure(  ){
+		header('Access-Control-Allow-Origin: *');
+		$openid = I('get.openid'); 
+		$userid = I('get.userid');
+		
+		//检测登录状态
+		$res=$this->checkLoginState($openid,$userid);
+		if(!$res['status']){
+			json_fail($res['message']);
+		}
+		
+		$data = json_decode( file_get_contents("php://input") ,true);
+		$insurance_data=M('insurance')->where(['id'=>$data['insure_id']])->find();
+		//添加保险记录信息
+		$insurance = array(
+			'vehicle_id'=>$data['vehicle_id'],
+			'insurance_id'=>$data['insure_id'],
+			'start_at'=>strtotime(date('Y-m-d',strtotime('+1 day'))),
+			'end_at'=>strtotime(date('Y-m-d',strtotime('+'.$insurance_data['years'].' year')))+24*3600-1,
+			'creator_id'=>$userid,
+			'created_at'=>time(),
+			'updated_at'=>time()
+		);
+		if(!M('insure_records')->createAdd($insurance)){
+			json_fail('添加保险失败');
+		}
+		
+		json_success('购买成功',$userid);
+		
+	}
+	
 
 }

MP_verify_0N3XFRGrseoZ6Fln.txt

@@ -0,0 +1 @@
+0N3XFRGrseoZ6Fln