From 5081bf09219bbd9ec313e5efeea7cdac2791718c Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 10 May 2018 11:46:40 +0800
Subject: [PATCH] =?UTF-8?q?trippest=20=E6=8B=BC=E5=9B=A2=E8=A1=A8=E7=9A=84?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E8=B4=A6=E5=8F=B7=E4=B8=BAnull?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/models/orders_model.php | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 5c2ed72b..41f64b11 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -487,14 +487,16 @@ class Orders_model extends CI_Model {
 
     public function get_SN_by_groupCode($code, $NoName)
     {
-        $sql = "SELECT top 1 COLI_SN,GRI_SN
+        $sql = "SELECT top 1 COLI_SN,GRI_SN,cold.COLD_PlanVEI_SN
                 FROM BIZ_ConfirmLineInfo coli
+                inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN
                 LEFT JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN
                 WHERE gri.GRI_No LIKE '%$code%' and gri.GRI_Name like '%$NoName%' ";
         $query = $this->HT->query($sql);
         if ($query->row()) {
             $this->BIZ_COLI_SN = $query->row()->COLI_SN;
             $this->GRI_SN = $query->row()->GRI_SN;
+            $this->COLD_PlanVEI_SN = $query->row()->COLD_PlanVEI_SN;
             return $query->row();
         }
         return NULL;
@@ -1701,17 +1703,19 @@ class Orders_model extends CI_Model {
 
     public function test()
     {
-      return NULL;
-      // 绑定之前同步的为"订单同步账号"
-      $sql = "UPDATE BIZ_ConfirmLineInfo
-              SET COLI_OPI_ID=435
-              WHERE COLI_SN IN
-                  (SELECT COLI_SN
-                   FROM groupcombineinfo gci
-                   INNER JOIN GRoupInfo gri ON gci.GCI_GRI_SN=gri.GRI_SN
-                   INNER JOIN BIZ_ConfirmLineInfo coli ON GRI_SN=coli.COLI_GRI_SN
-                   AND coli.COLI_OPI_ID IS NULL
-               )";
+      // return NULL;
+      $sql = "UPDATE groupcombineinfo
+SET [GCI_VEI_SN]=1343
+WHERE gci_vei_sn IS NULL
+  AND gci_sn IN
+    (SELECT gci.[GCI_SN]
+     FROM groupcombineinfo gci
+     INNER JOIN GRoupInfo gri ON gci.GCI_GRI_SN=gri.GRI_SN
+     INNER JOIN BIZ_ConfirmLineInfo coli ON GRI_SN=coli.COLI_GRI_SN
+INNER JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_COLI_SN=COLI_SN
+     WHERE 1=1
+AND gci.gci_vei_sn IS NULL
+       AND COLD_PlanVEI_SN=1343)";
       $query = $this->HT->query($sql);
     }