Merge branch 'master' of github.com:hainatravel/information-system

application/third_party/tripadvisor_spider/controllers/index.php

@@ -434,6 +434,9 @@ class Index extends CI_Controller {
 			header("HTTP/1.1 404 Not Found");  
 			exit('{"status":"404","reason":"请输入站点代码！"}');
 		}else{
+			$product_code = $this->input->get_post('productCode');
+			
+			if(empty($product_code)){
 				$return_data = array();
 				$ta_website = $this->config->item('tripadvisor_website');
 				if(empty($ta_website[$destination])){
@@ -442,9 +445,10 @@ class Index extends CI_Controller {
 				}
 				
 				$return_data['list_url'] = str_replace('{PAGENUM}','',$ta_website[$destination]);
+			}
 			
 			//根据站点获取评论
-			$list_reviews = $this->Tripadvisor_Review_model->get_fivelatestreviews($destination);
+			$list_reviews = $this->Tripadvisor_Review_model->get_fivelatestreviews($destination,$product_code);
 			$return_data['list_reviews'] = $list_reviews;
 			print_r(json_encode($return_data));
 		}

application/third_party/tripadvisor_spider/models/Tripadvisor_Review_model.php

@@ -198,18 +198,15 @@ class Tripadvisor_Review_model extends CI_Model {
 		return $query->result();
 	}
 	
-	public function get_fivelatestreviews($destination){
+	public function get_fivelatestreviews($destination,$product_code=null){
+		if(!empty($product_code)){
+			$where = "and tr_product_code = '{$product_code}'";
+		}else{
+			$where = '';
+		}
 		$sql = "select top 5 
-							tr_review_title,
+							*
-							tr_content,
+				from Ta_Reviews where tr_destination = ? {$where} and tr_member_starts = '5' order by tr_review_date desc";
-							tr_member_name,
-							tr_member_loc,
-							tr_member_starts,
-							tr_review_date,
-							tr_visited_date,
-							tr_review_pics,
-							tr_datetime
-				from Ta_Reviews where tr_destination = ? and tr_member_starts = '5' order by tr_review_date desc";
 		$query = $this->INFO->query($sql,array($destination));
 		return $query->result();
 	}

application/third_party/tripadvisor_spider/views/third_party_input.php

@@ -162,6 +162,10 @@
 										<option value="tp_Beijing">tp_Beijing</option>
 										<option value="tp_Shanghai">tp_Shanghai</option>
 										<option value="tp_Guilin">tp_Guilin</option>
+										<option value="tp_Xian">tp_Xian</option>
+										<option value="tp_Zhangjiajie">tp_Zhangjiajie</option>
+										<option value="tp_Hangzhou">tp_Hangzhou</option>
+										<option value="tp_Hangzhou">tp_Chengdu</option>
 									</select>
 								</div>
 								<div class="col-md-3">