From a63efa6aaa30ef4bc4227fbce28a94e65126ce7b Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Wed, 12 Jun 2019 13:45:32 +0800
Subject: [PATCH] =?UTF-8?q?BIZ=E5=A4=87=E6=B3=A8;=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=AE=8C=E6=95=B4=E5=90=8D=E7=A7=B0;[?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E6=94=B6=E5=A4=87=E6=B3=A8,?=
 =?UTF-8?q?=E5=BE=85=E5=88=A0=E9=99=A4]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webht/third_party/vendorPlanSync/libraries/Tulanduo.php   | 8 ++++++++
 webht/third_party/vendorPlanSync/models/Group_model.php   | 3 ++-
 .../TuLanDuo_addOrUpdateRouteOrderContentBuilder.php      | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index 5159a13f..ff2c55dd 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -49,6 +49,7 @@ class Tulanduo
     public $list_url     = "http://ltdj.ltsoftware.net:19919/action/api/searchRouteOrder/";
     public $detail_url   = "http://ltdj.ltsoftware.net:19919/action/api/detailRouteOrder/";
     public $neworder_url = "http://ltdj.ltsoftware.net:19919/action/api/addOrUpdateRouteOrder/";
+    // public $neworder_url = "http://ltdj.ltsoftware.net:18888/action/api/addOrUpdateRouteOrder/";
     // Live
     // public $list_url     = "http://djb3c.ltsoftware.net:9921/action/api/searchRouteOrder/";
     // public $detail_url   = "http://djb3c.ltsoftware.net:9921/action/api/detailRouteOrder/";
@@ -260,6 +261,9 @@ class Tulanduo
                         if (isset($vgrd->back_traffic)) {
                             $this->ci->tldOrderBuilder->setBackTraffic(trim($vgrd->back_traffic));
                         }
+                        if (isset($vgrd->vendor_memo)) {
+                            $this->ci->tldOrderBuilder->setOrderRemark(trim($vgrd->vendor_memo));
+                        }
                     }
                 }
             }
@@ -845,6 +849,9 @@ log_message('error',$resp);
                                             ->setTravelFeesUnit($fee_index, 1)
                                             ->setTravelFeesSumMoney($fee_index, $travel_fees->SUM_SSJE);
                     ++$fee_index;
+                    $this->ci->tldOrderBuilder->setReplaceCollectionsType(0, "Per Group")
+                                            ->setReplaceCollectionsMoney(0, $travel_fees->SUM_SSJE)
+                                            ->setReplaceCollectionsRemark(0, "测试代收备注 " . $travel_fees->SUM_SSJE);
                 }
                 if ( ! empty($replace_collections) ) {
                     $this->ci->tldOrderBuilder->setReplaceCollectionsType(0, "Per Group")
@@ -863,6 +870,7 @@ log_message('error',$resp);
             $vps_sn = 0;
             $vendor_orderid = 0;
             $this->ci->tldOrderBuilder->clearModifyLogInfo();
+echo $this->ci->tldOrderBuilder->getBizContent();
             $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder);
             $response = json_decode($resp);
             if ($response->status == 1) {
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 5f02ad0e..782ddad9 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -25,7 +25,7 @@ class Group_model extends CI_Model {
                     AND VAS_IsCancel=0 AND VAS_Delete=0 AND vas.DeleteFlag=0
                     AND VAS_IsSendSucceed=1 AND VAS_IsReceive=0
                     AND EOI_GetDate between '$start_date' AND '$end_date'
-                    AND EOI_GetDate > CONVERT(date, GETDATE())
+                    -- AND EOI_GetDate > CONVERT(date, GETDATE()) -- released
                     -- Trippest, not confirm, not change -- for Trippest deploy
                     -- AND GRI_OrderType=227002
                     AND VAS_IsConfirm=0 AND VAS_SendVary=0
@@ -126,6 +126,7 @@ log_message('error', "SET NOCOUNT ON;EXEC Tourmanager.dbo.SP_VendorPlan_GetPlanI
                         $vgrd->ACI_BabyNum   = intval($vcold->COLD_BabyNum);
                         $vgrd->PAG_DEI_SN    = $vcold->PAG_DEI_SN;
                         $vgrd->PAG_sub_sn    = intval($vcold->COLD_ServiceSN2);
+                        $vgrd->vendor_memo   = trim($vcold->COLD_VendorMemo);
                         if ( strval($vcold->COLD_ServiceType)==='D') {
                             $vgrd->PAG_Code = mb_strtoupper($vcold->PAG_Code);
                             $vgrd->PAG_ExtendType = mb_strtoupper($vcold->PAG_ExtendType);
diff --git a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
index df3411c8..bf27da86 100644
--- a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
+++ b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
@@ -123,7 +123,7 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
     }
     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)