From 0f75fff5a28d3277dca1b84d6e080d7ae18fc7c8 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 14 Aug 2018 17:57:26 +0800
Subject: [PATCH] =?UTF-8?q?trippest=E5=90=8C=E6=AD=A5:=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=9B=A2=E5=8F=B7=E6=98=AF=E5=90=A6=E5=B7=B2?=
 =?UTF-8?q?=E5=BD=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php  |  4 ++--
 .../trippestOrderSync/models/orders_model.php      | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 9118adc0..4ac131df 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -174,7 +174,7 @@ class TulanduoApi extends CI_Controller
             if ($this->Orders_model->BIZ_COLI_SN === null && in_array($vo['agcName'], array("D目的地桂林组", "Trippest", "桂林海纳国旅"))) {
                 $real_groupCode = $this->analysis_groupCode($vo['agcOrderNo']);
                 // set BIZ_COLI_SN, GRI_SN at Orders_model
-                $this->Orders_model->get_SN_by_groupCode($real_groupCode, $real_groupCode);
+                $this->Orders_model->get_SN_by_groupCode($real_groupCode, $vo['orderId']);
             }
             /** insert HT */
             if ($this->Orders_model->GRI_SN === null) {
@@ -338,7 +338,7 @@ class TulanduoApi extends CI_Controller
             $getInfo_byGroupCode = null;
             if (in_array($order->GCI_FromAgc, array("D目的地桂林组", "Trippest"))) {
                 $real_groupCode = $this->analysis_groupCode($detail_jsonResp->orderDetail->agcOrderNo);
-                $getInfo_byGroupCode = $this->Orders_model->get_SN_by_groupCode($real_groupCode, $real_groupCode);
+                $getInfo_byGroupCode = $this->Orders_model->get_SN_by_groupCode($real_groupCode, $detail_jsonResp->orderDetail->orderId);
             }
             $groupSN              = $getInfo_byGroupCode!==null ? $getInfo_byGroupCode->GRI_SN : $order->COLI_GRI_SN;
             $coli_sn              = isset($getInfo_byGroupCode->COLI_SN) ? $getInfo_byGroupCode->COLI_SN : $order->COLI_SN;
diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index b74d9cbc..e8a53939 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -511,11 +511,16 @@ class Orders_model extends CI_Model {
         return NULL;
     }
 
-    public function get_SN_by_groupCode($code, $NoName)
+    public function get_SN_by_groupCode($code, $vendorOrderId=NULL)
     {
+      $vendorOrderId_sql = $vendorOrderId===null ? "" : " case when GCI_VendorOrderId=$vendorOrderId then 0 else 1 end asc, ";
       $gri_sql = "SELECT top 1 GRI_SN,GRI_OPI_ID,GRI_operator,GRI_No,GRI_Name
                     from GRoupInfo
-                    where GRI_Name like '%$code%' ";
+                    left join GroupCombineInfo on GCI_GRI_SN=GRI_SN
+                    where GRI_Name like '%$code%'
+                    order by
+                      $vendorOrderId_sql
+                      GCI_GRI_SN desc,GCI_SN asc";
       $gri_query = $this->HT->query($gri_sql);
       if ($gri_query->num_rows() > 0) {
         $this->GRI_SN       = $gri_query->row()->GRI_SN;
@@ -525,8 +530,8 @@ class Orders_model extends CI_Model {
                       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 COLI_GroupCode like '%$code%' ";
-                      // where COLI_GRI_SN=" . $this->GRI_SN;
+                      where COLI_GRI_SN=" . $this->GRI_SN;
+                      // where COLI_GroupCode like '%$code%' ";
         $coli_query = $this->HT->query($coli_sql);
         if ($coli_query->num_rows() > 0) {
           $this->BIZ_COLI_SN = $coli_query->row()->COLI_SN;
@@ -1827,6 +1832,7 @@ class Orders_model extends CI_Model {
     {
       // return NULL;
       $sql = "
+
        ";
       $query = $this->HT->query($sql);
     }