From 2f2df42f371ee58976c4d5c896008ba98c8177d1 Mon Sep 17 00:00:00 2001
From: QxQ <ch19940729@gmail.com>
Date: Tue, 21 May 2019 16:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=A4=9A=E5=A0=B4=E5=96=AE?=
 =?UTF-8?q?=E8=B3=87=E6=96=99=E5=BA=AB=E9=82=8F=E8=BC=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 models/Carpayment_model.php | 11 ++++++-----
 models/Cars_model.php       | 39 ++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/models/Carpayment_model.php b/models/Carpayment_model.php
index 98f5230..cb4df5d 100644
--- a/models/Carpayment_model.php
+++ b/models/Carpayment_model.php
@@ -300,7 +300,7 @@ class Carpayment_model extends CI_Model
 	// 取得進場資訊 (模糊比對)
 	function q_fuzzy_pks($word)
 	{
-		if(empty($word) || strlen($word) < 4 || strlen($word) > 10)
+		if(empty($word) || strlen($word) < 3 || strlen($word) > 8)
 		{
 			return null;
 		}
@@ -458,7 +458,7 @@ class Carpayment_model extends CI_Model
 	}
 	
 	// 建立博辰查詢入場時間資料
-	function gen_query_data($lpr)
+	function gen_query_data($lpr,$station_no)
 	{
 		$data = array();
 		
@@ -503,7 +503,8 @@ class Carpayment_model extends CI_Model
         $result = $this->db->select("date_format(start_date, '%Y/%m/%d') as start_date, date_format(end_date,'%Y/%m/%d') as end_date")
         		->from('members')	
                 ->where(array(
-						'lpr' => $lpr, 
+						'lpr' => $lpr,
+						'station_no' => $station_no,
 						'start_date <' => $this->vars['date_time'],
 						'end_date >=' => $this->vars['date_time'])
 						, false)
@@ -573,14 +574,14 @@ class Carpayment_model extends CI_Model
 			{
 				$result_lpr = $rows['lpr'];
 				$ticket_no = $rows['ticket_no'];
-				
+				$station_no = $rows['station_no'];
 				if($result_lpr == 'NONE')
 				{
 					$tmp_data = $this->gen_query_data_type4($ticket_no);	// 備緩搜尋
 				}
 				else
 				{
-					$tmp_data = $this->gen_query_data($result_lpr);			// 模糊搜尋
+					$tmp_data = $this->gen_query_data($result_lpr,$station_no);			// 模糊搜尋
 				}
 				
 				if($tmp_data['ticket'] == 1)
diff --git a/models/Cars_model.php b/models/Cars_model.php
index b7795b0..cdf9ecb 100644
--- a/models/Cars_model.php
+++ b/models/Cars_model.php
@@ -130,7 +130,7 @@ class Cars_model extends CI_Model
             }
         }
 
-        $rows = $this->get_member($parms['lpr']);
+        $rows = $this->get_member($parms['lpr'],$parms['sno']);
 
         return $this->save_db_io($parms, $rows, true);
     }
@@ -158,7 +158,7 @@ class Cars_model extends CI_Model
             }
         }
 
-        $rows = $this->get_member($parms['lpr']);
+        $rows = $this->get_member($parms['lpr'],$parms['sno']);
 
         return $this->save_db_io($parms, $rows);
     }
@@ -305,9 +305,18 @@ class Cars_model extends CI_Model
 					}
 					
 					// 訊息
-					if ($rows['member_no'] == 0)
+					// 訊息
+					if ($rows['member_no'] > 0)
 					{
-						$ck = md5($parms['lpr']);
+						// [msg] 4: 會員, 開門
+						$msg_id = 4;
+							
+						// 會員開門
+						$this->member_opendoors($parms);
+					}
+					else
+					{
+						/*$ck = md5($parms['lpr']);
 						$jdata = file_get_contents("http://localhost/allpa_service.html/get_allpa_valid_user/{$parms['lpr']}/{$ck}");
 						$results = json_decode($jdata, true);
 						if($results['result_code'] == 0)
@@ -319,21 +328,13 @@ class Cars_model extends CI_Model
 							$this->member_opendoors($parms);
 						}
 						else
-						{
+						{*/
 							// [msg] 11: 臨停車, 開門
 							$msg_id = 11;
 							
 							// 臨停開門
 							$this->temp_opendoors($parms);
-						}
-					}
-					else
-					{
-						// [msg] 4: 會員, 開門
-						$msg_id = 4;
-							
-						// 會員開門
-						$this->member_opendoors($parms);
+						//}
 					}
 					
 					// 字幕
@@ -768,7 +769,7 @@ class Cars_model extends CI_Model
 
 
     // 檢查是否合法會員或VIP資料
-	public function get_member($lpr)
+	public function get_member($lpr,$sno)
 	{
     	$where_arr = array
         (
@@ -794,8 +795,12 @@ class Cars_model extends CI_Model
                 where c.member_no = m.member_no
                 and c.start_time <= '{$this->now_str}'
                 and c.end_time >= '{$this->now_str}'
-                and c.lpr = '{$lpr}'
-                limit 1";
+                and c.lpr = '{$lpr}' ";
+				if(!empty($sno) && $sno > 0)
+				{
+					$sql = "{$sql}and c.station_no = {$sno} ";
+				}
+                $sql = "{$sql}limit 1";
 
         $rows = $this->db->query($sql)->row_array();