From 59ee9d682e966ed4c49f23c03af458e46b63cf79 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 24 Sep 2019 14:05:26 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20Trippest=E5=90=8C=E6=AD=A5:=20?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=9B=A2=E5=8F=B7=E7=9B=B8=E5=90=8C=E4=BD=86?=
 =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A2=E5=8D=95=E5=8F=B7=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trippestOrderSync/controllers/TulanduoApi.php            | 5 ++++-
 webht/third_party/trippestOrderSync/models/orders_model.php  | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index 48b91f8f..493501b7 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -214,6 +214,7 @@ class TulanduoApi extends CI_Controller
             }
         }
         if (empty($to_update_list)) {
+            echo "empty";
             return false;
         }
         $unique_orderGroupCombine = array();    // 录入拼团调度时,避免重复
@@ -239,6 +240,7 @@ class TulanduoApi extends CI_Controller
                     $this->order_cancel($order->COLI_ID);
                 }
             }
+            echo "cancel";
             return;
         }
         if (isset($detail_jsonResp->orderDetail->agcOrderNo) && $detail_jsonResp->orderDetail->agcOrderNo!="") {
@@ -276,6 +278,7 @@ class TulanduoApi extends CI_Controller
             }
         }
         if (strval($detail_jsonResp->orderDetail->orderStatus) !== '1') {
+            echo "not confirm";
             return;
         }
         /** HT 开始 */
@@ -288,7 +291,7 @@ class TulanduoApi extends CI_Controller
             if (strlen($real_groupCode) < 9) {
                 $real_groupCode = $real_groupCode_info['all'];
             }
-            $getInfo_byGroupCodeArr = $this->Orders_model->get_order_by_groupcode($real_groupCode, $order->GCI_VendorOrderId);
+            $getInfo_byGroupCodeArr = $this->Orders_model->get_order_by_groupcode($real_groupCode, $order->GCI_VendorOrderId, $vei_SN);
         }
         $duplicate = false;
         // 由同步新增的订单 或 未找到团号关联
diff --git a/webht/third_party/trippestOrderSync/models/orders_model.php b/webht/third_party/trippestOrderSync/models/orders_model.php
index 42cdf5a3..893f2161 100644
--- a/webht/third_party/trippestOrderSync/models/orders_model.php
+++ b/webht/third_party/trippestOrderSync/models/orders_model.php
@@ -591,8 +591,9 @@ class Orders_model extends CI_Model {
      * @date   2018-08-23
      * @param  [type]     $code [description]
      */
-    public function get_order_by_groupcode($code, $order_id=0)
+    public function get_order_by_groupcode($code, $order_id=0, $vei_sn=0)
     {
+        $vei_sn_sql = $vei_sn===0 ? " " : " AND COLD_PlanVEI_SN=$vei_sn ";
         $sql = "SELECT COLI_SN,gri.GRI_SN,cold.COLD_PlanVEI_SN,cold.COLD_SN,coli.COLI_ID,
                     (select top 1 case gci_vendororderId when $order_id then gci_vendororderId else 0 end
                       from groupcombineinfo where gci_gri_sn=coli_gri_sn
@@ -604,6 +605,7 @@ class Orders_model extends CI_Model {
                     coli.COLI_Memo,cold.COLD_MemoText
                 FROM BIZ_ConfirmLineInfo coli
                 inner join BIZ_ConfirmLineDetail cold on cold.COLD_COLI_SN=COLI_SN
+                    $vei_sn_sql
                 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 coli.COLI_GroupCode LIKE '%$code%'