From 403e626b20193712159d20988e5f7446ebfc9799 Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Tue, 18 Jun 2019 10:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E6=8E=A5=E8=AE=A1=E5=88=92:Trippest?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E9=A2=84=E8=AE=A2=E4=BA=86=E5=A4=9A=E5=9C=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AF=BC=E8=87=B4=E9=87=8D=E5=A4=8D=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/libraries/Tulanduo.php | 2 +-
 webht/third_party/vendorPlanSync/models/Group_model.php | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index accca6fe..c7338520 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -902,7 +902,7 @@ class Tulanduo
                     $this->ci->BIZ_order->insert_biz_order_log($coli_sn, "vendorPlanUpdateSendout_" . $tour_code);
                 }
                 /** VendorArrangeState VAS_IsReceive */
-                $this->ci->Group_model->set_plan_received($vas_sn);
+                $this->ci->Group_model->set_plan_received($vas_sn, $gri_sn);
             }
         }
         return "[Tulanduo>push_trippest] Done. " . $COLI_ID;
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 1baa4bce..d3d0b41a 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -296,10 +296,13 @@ class Group_model extends CI_Model {
         return $eva_g_sn;
     }
 
-    public function set_plan_received($vas_sn=0)
+    public function set_plan_received($vas_sn=0, $gri_sn=null)
     {
-        $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=? ";
-        return $this->HT->query($sql, array($vas_sn));
+        $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=$vas_sn ";
+        if ($gri_sn !== null) {
+            $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_GRI_SN=$gri_sn ";
+        }
+        return $this->HT->query($sql);
     }
 
     /*!