diff --git a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
index 67555667..2c71b0f6 100644
--- a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php
@@ -5,16 +5,16 @@ if (!defined('BASEPATH'))
 
 class Tulanduo extends CI_Controller
 {
-    public $special_route = array(
-        "BJSIC-42" => "'BJSIC-41','BJSIC-42'"
-        ,"BJSIC-43" => "'BJSIC-41','BJSIC-42','BJSIC-43'"
-        ,"XASIC-42" => "'XASIC-41','XASIC-42'"
-    );
-    public $special_route_name = array(
-        "BJSIC-42" => "北京精品两日游（目的地BJSIC-42）"
-        ,"BJSIC-43" => "北京精品三日游（目的地BJSIC-43）"
-        ,"XASIC-42" => "西安精品两日游（目的地XASIC-42）"
-    );
+    // public $special_route = array(
+    //     "BJSIC-42" => "'BJSIC-41','BJSIC-42'"
+    //     ,"BJSIC-43" => "'BJSIC-41','BJSIC-42','BJSIC-43'"
+    //     ,"XASIC-42" => "'XASIC-41','XASIC-42'"
+    // );
+    // public $special_route_name = array(
+    //     "BJSIC-42" => "北京精品两日游（目的地BJSIC-42）"
+    //     ,"BJSIC-43" => "北京精品三日游（目的地BJSIC-43）"
+    //     ,"XASIC-42" => "西安精品两日游（目的地XASIC-42）"
+    // );
     public $city_info = array(
         "北京分公司" => array(
             "PlanVEI_SN" => 1343
@@ -58,9 +58,10 @@ class Tulanduo extends CI_Controller
         mb_regex_encoding("UTF-8");
         bcscale(4);
         $this->load->helper('array');
+        $this->load->library('trippest');
         $this->load->model('Group_model');
         $this->load->model('BIZ_orders_model', 'BIZ_order');
-        $this->load->model('TuLanDuo_queryContentBuilder', 'tld_order');
+        // $this->load->model('TuLanDuo_queryContentBuilder', 'tld_order');
         // $this->output->enable_profiler(TRUE);
         /** test */
         $this->userId = "358";
@@ -74,22 +75,28 @@ class Tulanduo extends CI_Controller
         // $this->key    = "d05c25e6e6c5d4898161e0aaf700d9c7";
     }
 
-    public function order_push()
+    public function order_push($GRI_SN=null)
     {
+        if ($GRI_SN !== null) {
+            return $this->push_trippest($GRI_SN);
+        }
         $start_date = date('Y-m-d');
         $end_date = date('Y-m-d 23:59:59', strtotime("+2 months"));
         $vei_sn_str = implode(",", $this->vendor_ids);
         $ready_to_send = $this->Group_model->get_plan_not_received(1, $vei_sn_str, $start_date, $end_date);
+        if (empty($ready_to_send)) {
+            return;
+        }
         $order = $ready_to_send[0];
+        // 目的地计划
         if (strval($order->GRI_OrderType) === "227002" && strval($order->department) === "30") {
-            // 目的地计划
             return $this->push_trippest($order->GRI_SN);
         }
+        // 商务
         if (strval($order->GRI_OrderType) === "227002") {
-            // 商务
         }
+        // 传统订单
         if (strval($order->GRI_OrderType) === "227001") {
-            // 传统订单
         }
 
         return $this->output->set_content_type('application/json')->set_output(json_encode($order));
@@ -97,10 +104,10 @@ class Tulanduo extends CI_Controller
 
     /*!
      * 发送目的地项目组预订计划到图兰朵地接系统
+     * 地接社未接受的或有变更的
      * @date   2018-05-02
-     * @param  string    $COLI_ID HT系统订单号
      */
-    public function push_trippest($gri_sn=0) // test
+    public function push_trippest($gri_sn=0)
     {
         // exit();
         /** 目的地 test */
@@ -110,70 +117,178 @@ class Tulanduo extends CI_Controller
         $orderinfo = $this->BIZ_order->get_orderinfo_detail($gri_sn);
         if(empty($orderinfo)) {return;}
         $COLI_ID = $orderinfo[0]->COLI_ID;
-        $COLD_SN_str = implode(',', array_map( function($element){return $element->COLD_SN;}, $orderinfo )) ;
-        $guestlist       = $this->BIZ_order->get_guestlist($COLD_SN_str);
-        $scheduleDetails = $this->BIZ_order->get_scheduleDetails($COLD_SN_str);
-        $routeName = isset($this->special_route_name[$scheduleDetails[0]->PAG_Code]) ? $this->special_route_name[$scheduleDetails[0]->PAG_Code] : $scheduleDetails[0]->PAG2_Name;
-        // 子线路
-        // todo 子线路方向
-        if ($scheduleDetails[0]->PAGS_CN_Title) {
-            $routeName .= "[" . $scheduleDetails[0]->PAGS_CN_Title . "]";
-        }
-        $routeName .= " " . $scheduleDetails[0]->PAG_Code;
-        if (isset($this->special_route[$scheduleDetails[0]->PAG_Code])) {
-            $scheduleDetails = $this->BIZ_order->get_packageDetails($this->special_route[$scheduleDetails[0]->PAG_Code]);
-        }
         $travelFees = $this->BIZ_order->get_paymentDetails($COLI_ID);
-        bcscale(4);
-        $this->tldOrderBuilder->setUserId($this->userId)
-                              ->setKey($this->key)
-                              ->setOrderType(2) // todo
-                              ->setRouteName($routeName)
-                              ->setRouteType($scheduleDetails[0]->city_chinese . "目的地线路")
-                              ->setAgcOrderNo($orderinfo[0]->COLI_GroupCode . "-" . $scheduleDetails[0]->city_code)
-                              ->setAdultNum($orderinfo[0]->COLD_PersonNum)
-                              ->setChildNum($orderinfo[0]->COLD_ChildNum)
-                              ->setDestination($scheduleDetails[0]->city_chinese)
-                              ->setTravelDate(strstr($orderinfo[0]->COLD_StartDate, " ", true))
-                              ->setLeavedDate(strstr($orderinfo[0]->COLD_EndDate, " ", true))
-                              ->setOrderRemark(trim($orderinfo[0]->COLI_Memo . "\r\n" . $orderinfo[0]->COLD_Memo . "\r\n" . $orderinfo[0]->COLD_MemoText)); // todo 抵离交通
-        foreach ($guestlist as $key => $vg) {
-            $this->tldOrderBuilder->setCustomersName($key, $vg->BPE_FirstName)
-                                  ->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童"))
-                                  ->setCustomersDocumentType($key, "护照") // Passport No.
-                                  ->setCustomersDocumentNo($key, $vg->BPE_Passport)
-                                  ->setCustomersOtherInfo($key, $this->BIZ_order->GetNationalityName($orderinfo[0]->GUT_NationalityID));
-        }
-        foreach ($scheduleDetails as $ks => $vs) {
-            $this->tldOrderBuilder->setScheduleDetailsContent($ks, $vs->PAG2_Title)
-                                  ->setScheduleDetailsTitle($ks, $vs->PAG2_Name)
-                                  // ->set_scheduleDetails($ks, "traffic", ($vs->PAG_Vehicle>60001 ? 1 : 0))
-                                  // ->setScheduleDetailsTraffic($ks, "traffic", ($vs->PAG_Vehicle>60001 ? 1 : 0))
-                                  ->setScheduleDetailsBreakFirst($ks, 0 )
-                                  ->setScheduleDetailsDinner($ks, (in_array($vs->PAG_Meal, array('61003', '61004')) ? 1 : 0) )
-                                  ->setScheduleDetailsLunch($ks, (in_array($vs->PAG_Meal, array('61002', '61004')) ? 1 : 0));
+        $fill_order = array();
+        $processed_date = array();
+        $processed_cold = array();
+        foreach ($orderinfo as $ko => $cold) {
+            if ( ! in_array($cold->COLD_SN, $processed_cold)) {
+                $processed_cold[] = $cold->COLD_SN;
+                $all_package = $this->trippest->tour_code($cold->pag_code);
+                $pag_info = $this->BIZ_order->get_packageDetails(my_implode("'",",",$all_package));
+                $fill_order[$cold->pag_code]["cold"][] = $cold;
+                $fill_order[$cold->pag_code]["package_info"] = $pag_info;
+            }
         }
-        foreach ($travelFees as $kf => $vf) { // todo 发生退款或多笔收款
-            $this->tldOrderBuilder->setTravelFeesType($kf, "Per Group")
-                                  ->setTravelFeesMoney($kf, $vf->GAI_SQJE)
-                                  ->setTravelFeesNum($kf, 1)
-                                  ->setTravelFeesUnit($kf, bcdiv($vf->GAI_SSJE, $vf->GAI_SQJE))
-                                  ->setTravelFeesSumMoney($kf, $vf->GAI_SSJE)
-                                  ->setTravelFeesRemark($kf, $vf->GAI_Memo);
+        // $fill_order = array_values($fill_order);
+        $i=0;
+        $take_apart = count($fill_order)>1 ? true : false;
+        foreach ($fill_order as $kf => $vf) {
+            $i++;
+            $this->tldOrderBuilder->resetBizContent();
+            $order_type = intval($vf["package_info"][0]->PAG_ExtendType)===39009 ? 1 : 2;
+            $last_code = count($vf["package_info"])-1;
+            $last_date = count($vf["cold"])-1;
+            $routeName = $vf["package_info"][0]->PAG2_Name . $vf["cold"][0]->pag_code;
+            $end_date = strstr($vf["cold"][$last_date]->COLD_StartDate, " ", true);
+            if (isset($this->trippest->special_route[$vf["cold"][0]->pag_code])) {
+                $routeName = $this->trippest->special_route[$vf["cold"][0]->pag_code]["name"];
+                $extra_day = $this->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;
+            if ($take_apart===true) {
+                $agcOrderNo .= "-" . $i;
+            }
+            $order_remark = "";
+            if (trim($vf['cold'][0]->GUT_TEL) != "") {
+                $order_remark = "预定人电话:" . trim($vf["cold"][0]->GUT_TEL);
+            }
+            $COLD_SN_str = implode(',', array_map( function($element){return $element->COLD_SN;}, $vf["cold"] )) ;
+            $guestlist = $this->BIZ_order->get_guestlist($COLD_SN_str);
+            $this->tldOrderBuilder->setUserId($this->userId)
+                                  ->setKey($this->key)
+                                  ->setOrderType($order_type)
+                                  ->setRouteName($routeName)
+                                  ->setRouteType($vf["package_info"][0]->city_chinese . "目的地线路")
+                                  ->setAgcOrderNo($agcOrderNo)
+                                  ->setAdultNum($vf["cold"][0]->COLD_PersonNum)
+                                  ->setChildNum($vf["cold"][0]->COLD_ChildNum)
+                                  ->setDestination($vf["package_info"][0]->city_chinese)
+                                  ->setTravelDate(strstr($vf["cold"][0]->COLD_StartDate, " ", true))
+                                  ->setLeavedDate($end_date)
+                                  ->setOrderRemark($order_remark)
+                                  // ->setOrderRemark(trim($orderinfo[0]->COLI_Memo . "\r\n" . $orderinfo[0]->COLD_Memo . "\r\n" . $orderinfo[0]->COLD_MemoText))
+                                  // todo 抵离交通
+                                  // ->setToTraffic($toTraffic)
+                                  // ->setBackTraffic($backTraffic)
+                                  ;
+            foreach ($guestlist as $key => $vg) {
+                $this->tldOrderBuilder->setCustomersName($key, $vg->BPE_FirstName . " " . $vg->BPE_LastName )
+                                      ->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童"))
+                                      ->setCustomersDocumentType($key, "护照") // Passport No.
+                                      ->setCustomersDocumentNo($key, $vg->BPE_Passport)
+                                      ->setCustomersOtherInfo($key, $this->BIZ_order->GetNationalityName($orderinfo[0]->GUT_NationalityID));
+            }
+            $scheduleDetails = $this->BIZ_order->get_scheduleDetails($COLD_SN_str);
+            $schedule_obj = array();
+            foreach ($scheduleDetails as $ks => $vs) {
+                $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['date'] = substr($vs->COLD_StartDate, 0, 10);
+                $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['lunch'] = (in_array($vs->PAG_Meal, array('61002', '61004')) ? 1 : 0);
+                $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['dinner'] = (in_array($vs->PAG_Meal, array('61003', '61004')) ? 1 : 0);
+                $this_content = $this_title = "";
+                if ( ! isset($schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['content'])) {
+                    $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['content'] = "";
+                }
+                // 人数
+                $this_content .= "\r\n人数:" . $vs->COLD_PersonNum . "大";
+                ($vs->COLD_ChildNum>0) ? $this_content .= $vs->COLD_ChildNum . "小" : null;
+                ($vs->COLD_BabyNum>0) ? $this_content .= $vs->COLD_BabyNum . "婴" : null;
+                $this_content .= "\r\n客人:";
+                $this_guest = "";
+                foreach ($guestlist as $dkg => $dvg) {
+                    if ($dvg->BPL_COLD_SN == $vs->COLD_SN) {
+                        $this_guest .= "," . $dvg->BPE_FirstName . " " . $dvg->BPE_LastName;
+                    }
+                }
+                $this_content .= substr($this_guest, 1);
+                // 酒店
+                $hotels = $this->BIZ_order->get_package_order($vs->COLD_SN);
+                if (trim($hotels[0]->POI_HotelAddress) != "") {
+                    $this_content .= "\r\n酒店地址:" . $hotels[0]->POI_HotelAddress;
+                }
+                if ($hotels[0]->POI_FlightsNo) {
+                    $this_content .= "\r\n航/车次:" . $hotels[0]->POI_FlightsNo;
+                    if ($hotels[0]->POI_FromCity || $hotels[0]->POI_ToCity) {
+                        $this_content .= ", (" . $hotels[0]->POI_FromCity . "-" . $hotels[0]->POI_ToCity . ")";
+                    }
+                    if ($hotels[0]->POI_Time || $hotels[0]->POI_EndTime) {
+                        $this_content .= ", " . $hotels[0]->POI_Time . " " . $hotels[0]->POI_EndTime;
+                    }
+                    if ($hotels[0]->POI_AirPort) {
+                        $this_content .= ", " . $hotels[0]->POI_AirPort;
+                    }
+                }
+                $this_content .= "\r\n";
+                $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['accommodation'] = $hotels[0]->POI_Hotel;
+                // 补充行程
+                $fill_date = array();
+                if (isset($this->trippest->special_route[$vs->PAG_Code])) {
+                    for ($j=0; $j < $this->trippest->special_route[$vs->PAG_Code]['day']; $j++) {
+                        $e_day = date("Y-m-d", strtotime("+$j day", strtotime($vs->COLD_StartDate)));
+                        if ( ! isset($schedule_obj[$e_day]['content'])) {
+                            $schedule_obj[$e_day]['content'] = "";
+                        }
+                        $schedule_obj[$e_day]['date'] = $e_day;
+                        $fill_date[] = $e_day;
+                        $schedule_obj[$e_day]['code'] = $this->trippest->special_route[$vs->PAG_Code]['code'][$j];
+                        $pag_detail = $this->BIZ_order->get_packageDetails("'" . $schedule_obj[$e_day]['code'] . "'");
+                        $schedule_obj[$e_day]['title'] = $pag_detail[0]->PAG2_Name;
+                        $schedule_obj[$e_day]['lunch'] = (in_array($pag_detail[0]->PAG_Meal, array('61002', '61004')) ? 1 : 0);
+                        $schedule_obj[$e_day]['dinner'] = (in_array($pag_detail[0]->PAG_Meal, array('61003', '61004')) ? 1 : 0);
+                        $schedule_obj[$e_day]['content'] .= $schedule_obj[$e_day]['title'] . $this_content;
+                        $schedule_obj[$e_day]['accommodation'] = $hotels[0]->POI_Hotel;
+                    }
+                }
+                // 行程
+                if ($vs->PAGS_CN_Title) {
+                    $this_title .= "[" . $vs->PAGS_CN_Title . "]";
+                }
+                if ($this_title == "") {
+                    $this_title .= $vs->PAG2_Name;
+                }
+                // 补充的行程避免重复
+                if ( ! in_array(substr($vs->COLD_StartDate, 0, 10), $fill_date)) {
+                    $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['content'] .= $this_title . $this_content;
+                }
+            }
+            foreach (array_values($schedule_obj) as $kso => $vso) {
+                $this->tldOrderBuilder->setScheduleDetailsTitle($kso, $vso['date'])
+                                      ->setScheduleDetailsContent($kso, $vso['content'])
+                                      ->setScheduleDetailsAccommodation($kso, $vso['accommodation'])
+                                      // ->setScheduleDetailsTraffic($kso, ($vso->PAG_Vehicle>60001 ? 1 : 0))
+                                      ->setScheduleDetailsBreakFirst($kso, 0 )
+                                      ->setScheduleDetailsDinner($kso, $vso['dinner'] )
+                                      ->setScheduleDetailsLunch($kso, $vso['lunch'])
+                                      ;
+            }
+            // 拆分的订单团款录第一个
+            if ($i===1) {
+                foreach ($travelFees as $kf => $vf) {
+                    $this->tldOrderBuilder->setTravelFeesType($kf, "Per Group")
+                                          ->setTravelFeesMoney($kf, $vf->GAI_SQJE)
+                                          ->setTravelFeesNum($kf, 1)
+                                          ->setTravelFeesUnit($kf, bcdiv($vf->GAI_SSJE, $vf->GAI_SQJE))
+                                          ->setTravelFeesSumMoney($kf, $vf->GAI_SSJE)
+                                          ->setTravelFeesRemark($kf, $vf->GAI_Memo);
+                }
+            }
+            echo(($this->tldOrderBuilder->getBizContent()));return;
+            // $this->output->set_content_type('application/json')->set_output($this->tldOrderBuilder->getBizContent());
+            // var_dump(($this->tldOrderBuilder->getBizContent()));
+            // $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder);
+            /** BIZ_GroupCombineInfo */
+    //         if (json_decode($resp)->status == 1) {
+    // log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
+    //             $this->BIZ_order->GCI_COLI_SN       = $orderinfo[0]->COLI_SN;
+    //             $this->BIZ_order->GCI_GRI_SN        = $orderinfo[0]->COLI_GRI_SN;
+    //             $this->BIZ_order->GCI_VendorOrderId = json_decode($resp)->responseData->orderId;
+    //             $this->BIZ_order->GCI_FromAgc       = "D目的地桂林组";
+    //             $this->BIZ_order->biz_groupcombineinfo_save();
+    //         }
         }
-        var_dump(($this->tldOrderBuilder->getBizContent()));
-        // $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder);
-        /** BIZ_GroupCombineInfo */
-//         if (json_decode($resp)->status == 1) {
-// log_message('error','in GCI ' . json_decode($resp)->responseData->orderId);
-//             $this->BIZ_order->GCI_COLI_SN       = $orderinfo[0]->COLI_SN;
-//             $this->BIZ_order->GCI_GRI_SN        = $orderinfo[0]->COLI_GRI_SN;
-//             $this->BIZ_order->GCI_VendorOrderId = json_decode($resp)->responseData->orderId;
-//             $this->BIZ_order->GCI_FromAgc       = "D目的地桂林组";
-//             $this->BIZ_order->biz_groupcombineinfo_save();
-//         }
         // email 供应商 todo
-        echo "Order Push done.";
+        // echo "Order Push done.";
         return;
     }
 
diff --git a/webht/third_party/vendorPlanSync/libraries/trippest.php b/webht/third_party/vendorPlanSync/libraries/trippest.php
new file mode 100644
index 00000000..ebba5748
--- /dev/null
+++ b/webht/third_party/vendorPlanSync/libraries/trippest.php
@@ -0,0 +1,63 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Trippest
+{
+    protected $ci;
+
+    public function __construct()
+    {
+        $this->ci =& get_instance();
+    }
+
+    public function tour_name($pag_code)
+    {
+        $name = "";
+        switch ($pag_code) {
+            case 'BJSIC-41':
+                $name = "One Day Beijing Highlights Tour";
+                break;
+            case 'BJSIC-42':
+                $name = "Two-Day Beijing Boutique Small Group Tour";
+                break;
+            case 'BJSIC-43':
+                $name = "Three-Day Beijing Discovery Tour";
+                break;
+
+            default:
+                break;
+        }
+        return $name;
+    }
+
+    public $special_route = array(
+        "BJSIC-42" => array(
+            "code" => array('BJSIC-41','BJSIC-42')
+            ,"name" => "北京精品两日游（目的地BJSIC-42）"
+            ,"day" => 2
+         )
+        ,"BJSIC-43" => array(
+            "code" => array('BJSIC-41','BJSIC-42','BJSIC-43')
+            ,"name" => "北京精品三日游（目的地BJSIC-43）"
+            ,"day" => 3
+         )
+        ,"XASIC-42" => array(
+            "code" => array('XASIC-41','XASIC-42')
+            ,"name" => "西安精品两日游（目的地XASIC-42）"
+            ,"day" => 2
+         )
+    );
+    public function tour_code($pag_code)
+    {
+        $ret = array($pag_code);
+        if (isset($this->special_route[$pag_code])) {
+            $ret = $this->special_route[$pag_code]["code"];
+        }
+        return $ret;
+    }
+
+
+}
+
+/* End of file trippest.php */
+/* Location: ./third_party/vendorPlanSync/libraries/trippest.php */
diff --git a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
index 433d17e6..ee0f1611 100644
--- a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
+++ b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
@@ -34,9 +34,10 @@ class BIZ_Orders_model extends CI_Model {
 
     public function get_orderinfo_detail($gri_sn)
     {
-        $sql = "SELECT top 1 coli.COLI_ID,
+        $sql = "SELECT coli.COLI_ID,
                        coli.COLI_Department,
                        cold.COLD_ServiceSN,
+                       (select PAG_Code from biz_packageinfo where PAG_SN=cold.COLD_ServiceSN) as pag_code,
                        cold.COLD_ServiceSN2,
                        cold.COLD_ServiceCity,
                        gut.GUT_NationalityID,
@@ -45,7 +46,7 @@ class BIZ_Orders_model extends CI_Model {
                 INNER JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_COLI_SN=coli.COLI_SN and cold.DeleteFlag=0
                 LEFT JOIN BIZ_GUEST gut ON gut.GUT_SN=coli.COLI_GUT_SN
                 WHERE coli.COLI_GRI_SN=$gri_sn
-                ORDER BY COLI_ApplyDate DESC";
+                ORDER BY COLD_StartDate ASC";
         $query = $this->HT->query($sql);
         return $query->result();
     }
@@ -66,37 +67,51 @@ class BIZ_Orders_model extends CI_Model {
     /** 根据订号 */
     public function get_scheduleDetails($COLD_SN_str)
     {
-        $sql = "SELECT
+        $sql = "SELECT COLD_StartDate,
                   (select CII2_name from CItyInfo2 where CII2_CII_SN=PAG_CII_SN and CII2_LGC=2) as city_chinese,
                   (select CII_PKCode from CItyInfo where CII_SN=PAG_CII_SN) as city_code
                 ,*
-                FROM BIZ_PackageInfo2 pag2
-                INNER JOIN BIZ_PackageInfo pag ON pag.PAG_SN=pag2.PAG2_PAG_SN
-                INNER JOIN BIZ_ConfirmLineDetail cold ON cold.COLD_ServiceSN=pag2.PAG2_PAG_SN AND (PAG2_LGC = 2)
+                FROM BIZ_ConfirmLineDetail cold
+                LEFT JOIN BIZ_PackageInfo2 pag2 ON cold.COLD_ServiceSN=pag2.PAG2_PAG_SN AND (PAG2_LGC = 2)
+                LEFT JOIN BIZ_PackageInfo pag ON pag.PAG_SN=pag2.PAG2_PAG_SN
                 left join BIZ_PackageInfoSub pis on pis.PAGS_PAG_SN=pag.PAG_SN and PAGS_LGC=1 and cold.COLD_ServiceSN2=PAGS_SN
-                WHERE COLD_SN IN ($COLD_SN_str)";
+                WHERE COLD_SN IN ($COLD_SN_str)
+                ORDER BY cold.COLD_StartDate asc ";
         $query = $this->HT->query($sql);
         return $query->result();
     }
     /** 根据线路代号 */
     public function get_packageDetails($pag_code_str)
     {
-        $sql = "SELECT *
+        $sql = "SELECT *,
+                  (select CII2_name from CItyInfo2 where CII2_CII_SN=PAG_CII_SN and CII2_LGC=2) as city_chinese,
+                  (select CII_PKCode from CItyInfo where CII_SN=PAG_CII_SN) as city_code
                 FROM BIZ_PackageInfo2 pag2
                 INNER JOIN BIZ_PackageInfo pag ON pag.PAG_SN=pag2.PAG2_PAG_SN and pag2.PAG2_LGC=2 and pag.PAG_DEI_SN=30
-                INNER JOIN CItyInfo2 cii2 on CII2_CII_SN=PAG_CII_SN and CII2_LGC=2
                 WHERE pag.PAG_Code IN ($pag_code_str)
                 order by pag.PAG_Code ";
         $query = $this->HT->query($sql);
         return $query->result();
     }
 
+    /** 酒店信息 */
+    public function get_package_order($COLD_SN_str)
+    {
+        $sql = "SELECT *
+                from BIZ_PackageOrderInfo poi
+                where poi.POI_COLD_SN IN ($COLD_SN_str)";
+        return $this->HT->query($sql)->result();
+    }
+
     public function get_paymentDetails($COLI_ID)
     {
         $sql = "SELECT *
                 FROM BIZ_GroupAccountInfo bgai
                 INNER JOIN BIZ_ConfirmLineInfo coli ON bgai.GAI_COLI_SN=coli.COLI_SN
-                WHERE coli_ID = '$COLI_ID'";
+                WHERE bgai.DeleteFlag=0 AND bgai.GAI_Type NOT IN (15006,15008,15017)
+                    AND ISNULL(bgai.GAI_VEI_SN,0)<>1343
+                    AND bgai.GAI_SQJE > 0
+                    AND coli_ID = '$COLI_ID'";
         $query = $this->HT->query($sql);
         return $query->result();
     }
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 2c6d4fa0..3a602790 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -23,6 +23,7 @@ class Group_model extends CI_Model {
                     and VAS_IsConfirm=0
                     and EOI_GetDate between '$start_date' and '$end_date'
                     and VAS_VEI_SN in ($vei_sn_str)
+                    and GRI_OrderType=227002 -- test
                     and (VAS_IsReceive=0 or (VAS_SendTime > ISNULL(VAS_ReceiveTime,0)))
                 order by EOI_GetDate asc, vas.VAS_IsConfirm asc ";
         return $this->HT->query($sql)->result();
diff --git a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
index 66f28198..277ed0b6 100644
--- a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
+++ b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
@@ -89,6 +89,13 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
         return $this->bizContent;
     }
 
+    public function resetBizContent()
+    {
+        $this->bizContentarr['orderData'] = $this->orderData = array();
+        $this->bizContent = NULL;
+        return $this->getBizContent();
+    }
+
     public function setUserId($userId)
     {
         $this->userId = $userId;