From 3c1f127bab59ab853ade233360cd19073e127fea Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 13 Jun 2019 10:17:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E5=90=8D=E4=BF=AE=E6=94=B9;=E7=94=A8?=
 =?UTF-8?q?=E6=88=BF=E6=A0=87=E5=87=86,=E8=AE=A2=E5=8D=95=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E4=BF=AE=E6=94=B9;=E6=93=8D=E4=BD=9C=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=8C=87=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vendorPlanSync/libraries/Tulanduo.php            | 12 ++++++++----
 .../TuLanDuo_addOrUpdateRouteOrderContentBuilder.php |  6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index fff3a8e5..04ce6d93 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -471,12 +471,16 @@ log_message('error',$resp);
                 $extra_day = $this->ci->trippest->special_route[$vf["cold"][0]->pag_code]["day"]-1;
                 $end_date = date("Y-m-d", strtotime("+$extra_day day", strtotime($vf["cold"][0]->COLD_StartDate)));
             }
-            $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code;
+            // $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code;
             if ($take_apart===true) {
-                $agcOrderNo .= "-" . $i;
+                // $agcOrderNo .= "-" . $i;
                 $tour_code = mb_strtoupper($vf["cold"][0]->pag_code);
             }
-            $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")";
+            // $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")";
+            $agcOrderNo = $vf["cold"][0]->COLI_GroupCode;
+            if (trim($vf["cold"][0]->COLI_PriceMemo) !== '') {
+                $agcOrderNo .= " (" . $vf["cold"][0]->COLI_PriceMemo . ")";
+            }
             $order_remark = "";
             if ($i===1) {   // 只写一次备注.备注中可能包含代收信息,避免多次收取
                 $order_remark_arr = array_filter(array_map( function($element){return $element->COLD_vendorMemo;}, $vf["cold"] )) ;
@@ -604,7 +608,7 @@ log_message('error',$resp);
                 $date_e = new DateTime(strstr($vs->COLD_EndDate, " ", TRUE));
                 $date_d = $date_e->diff($date_s);
                 $d_t = ($date_d->format("%a"));
-                if ($d_t > 0) {
+                if ($d_t > 0 && empty($fill_date)) {
                     for ($d_i=0; $d_i < ($d_t+1); $d_i++) {
                         $f_d = date('Y-m-d', strtotime("+$d_i day", strtotime(substr($vs->COLD_StartDate, 0, 10))));
                         $schedule_obj[$f_d] = $schedule_obj[substr($vs->COLD_StartDate, 0, 10)];
diff --git a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
index eb7bb473..bf27da86 100644
--- a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
+++ b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
@@ -118,12 +118,12 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
     }
     public function setRoomStandard($roomStandard)
     {
-        $this->orderData['roomStandard'] = $roomStandard;
+        $this->orderData['roomStandard'] = isset($this->orderData['roomStandard']) ? ($this->orderData['roomStandard'] . "\r\n" . $roomStandard) : $roomStandard;
         return $this;
     }
     public function setOrderRemark($orderRemark)
     {
-        $this->orderData['orderRemark'] = $orderRemark;
+        $this->orderData['orderRemark'] = isset($this->orderData['orderRemark']) ?  ($this->orderData['orderRemark'] . "\r\n" . $orderRemark) : $orderRemark;
         return $this;
     }
     public function setRouteStandard($routeStandard)
@@ -133,7 +133,7 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
     }
     public function setDestination($destination)
     {
-        $this->orderData['destination'] = $destination;
+        $this->orderData['destination'] = $destination . "分公司";
         return $this;
     }
     public function setTravelDate($travelDate)