From c27e103862c421b14f2aa2214531de67d3966db9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Fri, 5 Jun 2020 16:37:52 +0800
Subject: [PATCH] fix

---
 .../third_party/tpmanage/controllers/webgetbokun.php | 12 +++++++++++-
 .../third_party/tpmanage/models/tpBokun_model.php    | 10 +++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/application/third_party/tpmanage/controllers/webgetbokun.php b/application/third_party/tpmanage/controllers/webgetbokun.php
index 8f3271fa..b1bbdfec 100644
--- a/application/third_party/tpmanage/controllers/webgetbokun.php
+++ b/application/third_party/tpmanage/controllers/webgetbokun.php
@@ -451,19 +451,29 @@ class webgetbokun extends CI_Controller
             $strParam.="'/day-tours/".strtolower(str_replace(" ","-",$city))."/',";
         }
         $strParam = trim($strParam,",");
-       // $strParam = "'/beijing/','/shanghai/'";   //本地测试
+       //$strParam = "'/beijing/','/shanghai/'";   //本地测试
         //传递
         $list = $this->tpBokun_model->getChtTours($strParam);
         if ($list){
 
             foreach ($list as $Item){
+                $data["city"] = $Item->city;
                 $data["ic_id"]=$Item->ic_id;
                 $data["ic_url"]=$Item->ic_url;
                 $data["ic_title"]=$Item->ic_title; 
+                $data["ic_url_title"]=$Item->ic_url_title;
+                $data["ic_content"] = $Item->ic_content;
+                $data["ic_summary"] = $Item->ic_summary;
+                $data["ic_seo_title"] = $Item->ic_seo_title;
+                $data["ic_seo_description"] = $Item->ic_seo_description;
+                $data["ic_seo_keywords"] = $Item->ic_seo_keywords;
+                $data["ic_photo"]=$Item->ic_photo;
+
 
                 //meta属性
                 $listmeta = $this->tpBokun_model->getChtToursMeta($Item->ic_id);
                 if ($listmeta){
+                    $arrmeta = array();
                     foreach($listmeta as $meta){
                         $MetaData["im_key"]=$meta->im_key;
                         $MetaData["im_value"]=$meta->im_value;
diff --git a/application/third_party/tpmanage/models/tpBokun_model.php b/application/third_party/tpmanage/models/tpBokun_model.php
index ae518679..5a3961bd 100644
--- a/application/third_party/tpmanage/models/tpBokun_model.php
+++ b/application/third_party/tpmanage/models/tpBokun_model.php
@@ -170,6 +170,7 @@ class TpBokun_model extends CI_Model
     var $pag_sn;
     var $PAG_CII_SN = 0;
     var $PAG_Code = "";
+    var $PAG_Type = "35004";
     var $PAG_Scheme = "1,2,3,4,5,6,7";
     var $PAG_Title = "";
     var $PAG_DEI_SN = "34";
@@ -192,6 +193,7 @@ class TpBokun_model extends CI_Model
                 INSERT INTO [BIZ_PackageInfo]
                 ([PAG_CII_SN]
                 ,[PAG_Code]
+                ,[PAG_Type]
                 ,[PAG_Scheme]
                 ,[CreatTime]
                 ,[PAG_Title]
@@ -205,6 +207,7 @@ class TpBokun_model extends CI_Model
         $query = $this->HT229Write->query($sql, array(
             $this->PAG_CII_SN,
             $this->PAG_Code,
+            $this->PAG_Type,
             $this->PAG_Scheme,
             $this->PAG_Title,
             $this->PAG_DEI_SN,
@@ -260,9 +263,10 @@ class TpBokun_model extends CI_Model
 
     /** CHT 那边的操作 */
     function getChtTours($strcity){
-        $sql = "select * from infoContents
-        inner join infoStructures on is_ic_id=ic_id
-        where 	ic_status = 1 
+        $sql = "select (select ic_url_title from infoContents inner join infoStructures on is_ic_id=ic_id where is_id = tbs.is_parent_id) as city
+        ,* from infoContents tbc
+        inner join infoStructures tbs on tbs.is_ic_id=tbc.ic_id
+        where ic_status = 1 
         and  is_parent_id in (
             select is_id from infoStructures
             inner join infoContents on is_ic_id=ic_id