From 7fbfe35f05cd0ff1b6da059fae98372dcb4580cb Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Mon, 14 May 2018 09:39:41 +0800
Subject: [PATCH] =?UTF-8?q?trippest=20=E7=9B=AE=E7=9A=84=E5=9C=B0=E6=94=B6?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E7=BA=BF=E4=B8=8D=E5=A4=84=E7=90=86=E5=9B=A2?=
 =?UTF-8?q?=E6=AC=BE,=20=E9=81=BF=E5=85=8D=E5=92=8C=E5=A4=96=E8=81=94?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=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          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
index d09227a1..4f102250 100644
--- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
+++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php
@@ -359,7 +359,7 @@ class TulanduoApi extends CI_Controller
             /*BIZ_PackageOrderInfo*/
             $this->Orders_model->POI_COLD_SN       = $cold_sn;
             $this->Orders_model->POI_Time          = $detail_jsonResp->orderDetail->travelDate;
-            $this->Orders_model->POI_Hotel         = $detail_jsonResp->orderDetail->scheduleDetails[0]->accommodation;
+            $this->Orders_model->POI_Hotel         = isset($detail_jsonResp->orderDetail->scheduleDetails[0]->accommodation) ? $detail_jsonResp->orderDetail->scheduleDetails[0]->accommodation : '';
             $this->Orders_model->POI_HotelAddress  = $detail_jsonResp->orderDetail->scheduleDetails[0]->accommodationAddress;
             $this->Orders_model->POI_HotelPhone    = $detail_jsonResp->orderDetail->scheduleDetails[0]->accommodationTelNo;
             $this->Orders_model->POI_EndTime       = $detail_jsonResp->orderDetail->leaveDate;
@@ -390,8 +390,9 @@ class TulanduoApi extends CI_Controller
                     $this->Orders_model->biz_groupaccountinfo_save();
                 }
             }
+            // 目的地项目组的订单为了避免重复录入, 外联会沟通录入, 这里不写入.  todo
             // 代收
-            if (isset($detail_jsonResp->orderDetail->replaceCollections)) {
+            if (isset($detail_jsonResp->orderDetail->replaceCollections) && ! in_array($order->GCI_FromAgc, array("D目的地桂林组", "Trippest")) ) {
                 foreach ($detail_jsonResp->orderDetail->replaceCollections as $krc => $vrc) {
                     // if ($vrc->reviewStatus == 0) {
                         // continue;
@@ -410,7 +411,7 @@ class TulanduoApi extends CI_Controller
                 }
             }
             // 代付
-            if (isset($detail_jsonResp->orderDetail->replacePays)) {
+            if (isset($detail_jsonResp->orderDetail->replacePays) && ! in_array($order->GCI_FromAgc, array("D目的地桂林组", "Trippest")) ) {
                 foreach ($detail_jsonResp->orderDetail->replacePays as $krp => $vrp) {
                     // if ($vrp->reviewStatus == 0) {
                         // continue;