From 5561afaa2815355fdd8b8214565cc1a9c2d743a9 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 25 Apr 2018 14:37:56 +0800
Subject: [PATCH] =?UTF-8?q?trippest=20=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=9B=A2?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E7=9A=84=E5=A4=96=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php         | 8 ++++++--
 .../third_party/trippestOrderSync/models/orders_model.php | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 8652f49e..da233e28 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -373,7 +373,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID);
         return;
     }
 
-    public function order_push($COLI_ID='170809390') // test
+    public function order_push($COLI_ID=0) // test
     {
         // exit();
         /** test */
@@ -444,6 +444,11 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
         return;
     }
 
+    public function order_change()
+    {
+        # code...
+    }
+
     protected function excute_curl($url, $content_builder) {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
@@ -454,7 +459,6 @@ log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
             "Accept: application/json"
         ));
 
-        // $params_str = ($this->characet(json_encode($this->params), "UTF-8"));
         $params_str = $content_builder->getBizContent();
         $postBody = array('jsonParams' => $params_str, "notHander" => 1);
 
diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 6c8772f3..7c76fb90 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -199,7 +199,7 @@ class Orders_model extends CI_Model {
         $sql = "IF NOT EXISTS(
                    SELECT TOP 1 1
                    FROM   BIZ_GroupCombineInfo
-                   WHERE  GCI_VendorOrderId = ?
+                   WHERE  GCI_VendorOrderId = ? and GCI_GRI_SN=?
                )
                INSERT INTO BIZ_GroupCombineInfo
                        (GCI_combineNo
@@ -222,6 +222,7 @@ class Orders_model extends CI_Model {
                        ";
         $query = $this->HT->query($sql, array(
             $this->GCI_VendorOrderId
+           ,$this->GCI_GRI_SN
            ,$this->GCI_combineNo
            ,$this->GCI_GRI_SN
            ,$this->GCI_VendorOrderId