From 7c9d92f71d47994e0f2c55de32003c831986ad63 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Fri, 26 Oct 2018 11:47:24 +0800
Subject: [PATCH] test

---
 .../trippestOrderSync/models/orders_model.php            | 2 +-
 .../third_party/vendorPlanSync/controllers/Tulanduo.php  | 9 +++++++--
 webht/third_party/vendorPlanSync/models/Group_model.php  | 9 ---------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 5d42bdf2..1d181545 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -587,7 +587,7 @@ class Orders_model extends CI_Model {
                 inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN
                 left JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN and GRI_OrderType=227002
                 WHERE (select OPI_DEI_SN from OperatorInfo where OPI_SN=COLI_OPI_ID)=30
-                  and coli.COLI_State<>50 and gri.GRI_No LIKE '%$code%'
+                  and coli.COLI_State<>50 and coli.COLI_GroupCode LIKE '%$code%'
                 order by case COLI_OPI_ID when 435 then 1 else 0 end asc,COLI_SN desc";
         $query = $this->HT->query($sql);
         return $query->result();
diff --git a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
index 37d4f782..a56d7ca2 100644
--- a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
@@ -58,7 +58,7 @@ class Tulanduo extends CI_Controller
         mb_regex_encoding("UTF-8");
         bcscale(4);
         $this->load->helper('array');
-        $this->load->model('Orders_model');
+        $this->load->model('BIZ_Orders_model', 'Orders_model');
         $this->load->model('TuLanDuo_queryContentBuilder', 'tld_order');
         // $this->output->enable_profiler(TRUE);
         /** test */
@@ -73,13 +73,18 @@ class Tulanduo extends CI_Controller
         // $this->key    = "d05c25e6e6c5d4898161e0aaf700d9c7";
     }
 
+    public function order_push($gri_sn)
+    {
+        # code...
+    }
+
     /*!
      * 发送预订计划到地接系统
      * TODO read word into remark
      * @date   2018-05-02
      * @param  string    $COLI_ID HT系统订单号
      */
-    public function order_push($COLI_ID="") // test
+    public function order_push2($COLI_ID="") // test
     {
         // exit();
         /** 目的地 test */
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 601e026e..56c9fe4a 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -14,15 +14,6 @@ class Group_model extends CI_Model {
         return $this->HT->query($sql)->result();
     }
 
-    public function get_guestlist($COLD_SN_str)
-    {
-        $sql = "SELECT *
-                FROM BIZ_BookPeopleList BPL
-                INNER JOIN BIZ_BookPeople BPE ON BPL_BPE_SN=BPE_SN
-                WHERE BPL_COLD_SN IN ($COLD_SN_str)";
-        $query = $this->HT->query($sql);
-        return $query->result();
-    }
 
 
 }