From 0a1fd5383eb6828ed2b15ce95c82452a680ee002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= <zhaopeng@hainatravel.com>
Date: Mon, 1 Jun 2020 13:51:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E5=89=8D=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../third_party/tpmanage/controllers/getbokun.php     | 11 +++++++----
 .../third_party/tpmanage/models/tpBokun_model.php     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/third_party/tpmanage/controllers/getbokun.php b/application/third_party/tpmanage/controllers/getbokun.php
index 0f13769d..a99f42be 100644
--- a/application/third_party/tpmanage/controllers/getbokun.php
+++ b/application/third_party/tpmanage/controllers/getbokun.php
@@ -9,13 +9,16 @@ class getbokun extends CI_Controller
     public function __construct()
     {
         parent::__construct();
+        $this->permission->is_admin();
         $this->load->library("Bokun_lib");
         $this->load->model("tpBokun_model");
+        $this->load->view('bootstrap3/footer');
     }
 
     public function index()
     {
         //echo "bokun数据导入页面！";
+        $this->load->view('bootstrap3/header');
         $this->load->view('getindex');
     }
 
@@ -172,7 +175,7 @@ class getbokun extends CI_Controller
 
 
         //先判断是否是新产品
-        $checkNewUrl = $this->webUrl . "/guide.php/thirdparty/tpmanage/webgetbokun/checkActivityId/$activityId/";
+        $checkNewUrl = $this->webUrl . "/info.php/thirdparty/tpmanage/webgetbokun/checkActivityId/$activityId/";
         $checkNew = json_decode($this->tpBokun_model->getCrulData($checkNewUrl));
         if ($checkNew->return == "yes" && $OverWrive == false) {
             return;
@@ -186,7 +189,7 @@ class getbokun extends CI_Controller
         $PassParam["CityName"] = $CityName;
         $PassParam["checkCode"] = $checkCode;
         $strPass = base64_encode(json_encode($PassParam));
-        $AddUrl = $this->webUrl . "/guide.php/thirdparty/tpmanage/webgetbokun/addActivity/$strPass/";
+        $AddUrl = $this->webUrl . "/info.php/thirdparty/tpmanage/webgetbokun/addActivity/$strPass/";
         $addInfo = json_decode($this->tpBokun_model->getCrulData($AddUrl));
         //echo($addInfo);
 
@@ -218,7 +221,7 @@ class getbokun extends CI_Controller
      */
     function checkAllCity()
     {
-        $url = "/guide.php/thirdparty/tpmanage/webgetbokun/checkAllCity/";
+        $url = "/info.php/thirdparty/tpmanage/webgetbokun/checkAllCity/";
         $str =  $this->tpBokun_model->getCrulData($url);
         echo $str;
     }
@@ -261,7 +264,7 @@ class getbokun extends CI_Controller
                             //解析后获取需要的参数
                             $activityId = $activityData->id; //产品的activityId，可以获取对应的产品详细内容。
                             //先判断是否是新产品
-                            $checkNewUrl = $this->webUrl . "/guide.php/thirdparty/tpmanage/webgetbokun/checkActivityId/$activityId/";
+                            $checkNewUrl = $this->webUrl . "/info.php/thirdparty/tpmanage/webgetbokun/checkActivityId/$activityId/";
                             $checkNew = json_decode($this->tpBokun_model->getCrulData($checkNewUrl));
                             if ($checkNew->return == "yes") {
                                 continue;
diff --git a/application/third_party/tpmanage/models/tpBokun_model.php b/application/third_party/tpmanage/models/tpBokun_model.php
index fc160794..49962c7d 100644
--- a/application/third_party/tpmanage/models/tpBokun_model.php
+++ b/application/third_party/tpmanage/models/tpBokun_model.php
@@ -21,7 +21,7 @@ class TpBokun_model extends CI_Model
     function getInfomationAll($guideurl)
     {
         //  $sql = "select top 1 * from infoContents a inner join infoStructures b on a.ic_id=b.is_ic_id where ic_URL='".$guideurl."'  and ic_status=1  and is_siteCode='ct'";
-        $sql = "select top 1 * from infoContents a inner join infoStructures b on a.ic_id=b.is_ic_id where ic_URL='" . $guideurl . "' and is_siteCode='" . Site_Code . "'";
+        $sql = "select top 1 * from infoContents a inner join infoStructures b on a.ic_id=b.is_ic_id where ic_URL='" . $guideurl . "' and is_siteCode='trippest'";
         $query = $this->HT->query($sql);
         if ($query->num_rows() > 0) {
             return $query->row();