From 70c4d90f41e823615f9cead4872818a902a64883 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 9 May 2018 16:07:46 +0800
Subject: [PATCH] =?UTF-8?q?trippest=20=E5=9B=A2=E5=90=8D=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index f71c0893..aa4302cd 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -155,7 +155,7 @@ class TulanduoApi extends CI_Controller
             if ($this->Orders_model->BIZ_COLI_SN === null && in_array($vo['agcName'], array("D目的地桂林组"))) {
                 $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, mb_substr($vo["agcName"] . $vo['agcOrderNo'], 0, 19));
+                $this->Orders_model->get_SN_by_groupCode($real_groupCode, $real_groupCode);
             }
             /** insert HT */
             if ($this->Orders_model->BIZ_COLI_SN === null) {
@@ -166,9 +166,9 @@ class TulanduoApi extends CI_Controller
                 $travelDate = new DateTime($vo['travelDate']);
                 $leaveDate  = new DateTime($vo['leaveDate']);
                 $date_diff  = $travelDate->diff($leaveDate);
-                $this->Orders_model->GRI_No        = mb_substr($vo['agcOrderNo'], 0, 19);
+                $this->Orders_model->GRI_No        = mb_substr($vo['agcOrderNo'], 0, 49);
                 $this->Orders_model->GRI_OrderType = 227002; // 商务
-                $this->Orders_model->GRI_Name      = mb_substr($vo["agcName"] . $vo['agcOrderNo'], 0, 19);
+                $this->Orders_model->GRI_Name      = mb_substr($vo["agcName"] . $vo['agcOrderNo'], 0, 49);
                 $this->Orders_model->GRI_PersonNum = $vo['adultNum']+$vo['childNum'];
                 $this->Orders_model->GRI_Days      = intval($date_diff->format('%R%a')+1);
                 $this->Orders_model->GRI_IsCancel  = 0;
@@ -222,7 +222,7 @@ class TulanduoApi extends CI_Controller
                 $this->Orders_model->GCI_groupType     = $vo['orderType'];
                 $this->Orders_model->GCI_travelDate    = $vo['travelDate'];
                 $this->Orders_model->GCI_leaveDate     = $vo['leaveDate'];
-                $this->Orders_model->GCI_createTime    = $vo['orderDate'];
+                $this->Orders_model->GCI_createTime    = date('Y-m-d H:i:s');
                 $this->Orders_model->biz_groupcombineinfo_save();
             }
         }
@@ -308,10 +308,11 @@ class TulanduoApi extends CI_Controller
             $this->Order_update->gci_where_update = " GCI_SN=" . $order->GCI_SN;
             $vei_SN = $this->city_info[$detail_jsonResp->orderDetail->operationDep]['PlanVEI_SN'] ? $this->city_info[$detail_jsonResp->orderDetail->operationDep]['PlanVEI_SN'] : 1343;
             $gci_update_column = array(
-                "GCI_combineNo"   => $detail_jsonResp->orderDetail->groupOrderNo
+                "GCI_combineNo"   => isset($detail_jsonResp->orderDetail->groupOrderNo) ? $detail_jsonResp->orderDetail->groupOrderNo : null
                 ,"GCI_VEI_SN"     => $vei_SN
                 ,"GCI_travelDate" => $detail_jsonResp->orderDetail->travelDate
                 ,"GCI_leaveDate"  => $detail_jsonResp->orderDetail->leaveDate
+                ,"GCI_createTime" => date('Y-m-d H:i:s')
             );
             $this->Order_update->biz_groupcombineinfo_update($gci_update_column);
             /** INSERT */
diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index dfed8def..e6b88da4 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -485,7 +485,7 @@ class Orders_model extends CI_Model {
         $sql = "SELECT top 1 COLI_SN,GRI_SN
                 FROM BIZ_ConfirmLineInfo coli
                 LEFT JOIN GRoupInfo gri ON coli.COLI_GRI_SN=gri.GRI_SN
-                WHERE gri.GRI_No LIKE '%$code%' and gri.GRI_No like '%$NoName%' ";
+                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;