地接计划: 传统团:发送导游备注.

webht/third_party/vendorPlanSync/libraries/Tulanduo.php

@@ -48,8 +48,8 @@ class Tulanduo
     // test:
     // 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:19919/action/api/addOrUpdateRouteOrder/";
-    public $neworder_url = "http://ltdj.ltsoftware.net:18888/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/";
@@ -111,7 +111,9 @@ class Tulanduo
             return false;
         }
         $guestlist = $this->ci->orders_model->get_customer_list($gri_sn);
-        $request_info = $this->ci->Group_model->get_plan_request($vas->GRI_SN);
+        $request_info = $this->ci->Group_model->get_plan_request($gri_sn);
+        $plan_remark = $this->ci->Group_model->get_plan_remark($gri_sn, $vei_sn);
+        $plan_remark = strval($plan_remark)==='' ? '' : "请导游准备: " . $plan_remark;
         /**
          * TODO:团队类型? 先写2
          * ??是否同一天含多个包价项目
@@ -129,7 +131,7 @@ class Tulanduo
         $big_order_index = 0;
         $expect_order_cnt = count($grd_apart_info['com'])+intval(!empty($grd_apart_info['big_pvt']))+intval(!empty($grd_apart_info['pvt']));
         foreach ($grd_apart_info as $group_key => $grd_a) {
-            $big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, $guestlist, $grd_a, $big_order_index);
+            $big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, $guestlist, $grd_a, $big_order_index, $plan_remark);
         }
         if ($big_order_index === $expect_order_cnt) {
             /** VendorArrangeState VAS_IsReceive */
@@ -143,7 +145,7 @@ class Tulanduo
      * @Date: 2019-05-30 16:11:34
      * @Desc: 执行发送订单计划信息. 参数已拆分归类好的行程
      */
-    public function tour_apart_order_exec($group_type, $vas, $request_info, $guestlist=null, $grd, $total_order_index)
+    public function tour_apart_order_exec($group_type, $vas, $request_info, $guestlist=null, $grd, $total_order_index, $plan_remark=null)
     {
         if (empty($grd)) {
             return $total_order_index;
@@ -209,10 +211,13 @@ class Tulanduo
                                     ->setDestination($destination)
                                     ->setTravelDate($first_date)
                                     ->setLeavedDate($end_date)
-                                    // ->setOrderRemark($order_remark)    // 订单备注 TODO:
                                     // ->setRoomStandard($request_info->GCI_HotelRequest)   // 住房标准
                                     ->setRouteStandard($request_info->GCI_Request) // 行程服务标准
                                     ;
+            // 订单备注
+            if (strval($plan_remark) !== '') {
+                $this->ci->tldOrderBuilder->setOrderRemark($plan_remark);
+            }
             $from_country = ""; // 客源地
             if ($guestlist===null) {
                 $g_cold_str = array_map(function ($ele){return $ele->GRD_COLD_SN;}, $vo['details']);
@@ -902,7 +907,7 @@ class Tulanduo
                                             ->setTravelFeesRemark($fee_index, "代收; " .  $replace_collections->ALL_Memo);
                 }
             }
-            // 查询是否变更 TODO: deprecated
+            // 查询是否变更 deprecated
             $sync_orderstate = 10;
             $vps_sn = 0;
             $vendor_orderid = 0;

webht/third_party/vendorPlanSync/models/Group_model.php

@@ -53,34 +53,8 @@ class Group_model extends CI_Model {
 
     public function get_vendor_plan_info($gri_sn, $vendor_id, $from_cold=false)
     {
-        // SET NOCOUNT ON 才能这样调用, 否则需要遍历结果集
+        $sql = "SET NOCOUNT ON;EXEC Tourmanager.dbo.SP_VendorPlan_GetPlanInfo $gri_sn, $vendor_id, 0 ";
-        // $sql = " Tourmanager.dbo.SP_VendorPlan_GetPlanInfo ?, ?, 0 ";
+        $grd_info = $this->call_sp_fun($sql);
-        // $grd_info = $this->HT->query($sql, array($gri_sn, $vendor_id))->result();
-        include('c:/database_conn.php');
-        $connection = array(
-            'UID' => $db['HT']['username'],
-            'PWD' => $db['HT']['password'],
-            'Database' => 'tourmanager',
-            'ConnectionPooling' => 1,
-            'CharacterSet' => 'utf-8',
-            'ReturnDatesAsStrings' => 1
-        );
-        $conn = sqlsrv_connect($db['HT']['hostname'], $connection);
-        $stmt = sqlsrv_query($conn, "SET NOCOUNT ON;EXEC Tourmanager.dbo.SP_VendorPlan_GetPlanInfo $gri_sn, $vendor_id, 0 ");
-        $result_object = array();
-        if (false !== $stmt ) {  // 无权限或执行错误返回false
-            // 存储过程中每个select都产生结果集
-            // 设置了SET NOCOUNT ON;就只有输出的结果集
-            $a = true;
-            while ($a !== false) {
-                $row = sqlsrv_fetch_object($stmt); // Retrieves the next row of data as a PHP object.
-                $a = !empty($row);
-                $a===true ? $result_object[] = $row : null;
-            }
-            sqlsrv_free_stmt($stmt);
-        }
-        sqlsrv_close($conn);
-        $grd_info = $result_object;
         $all_day_no = array_map(function($ele){return $ele->GRD_DayNo;}, $grd_info);
         $day_no_str = implode(",", $all_day_no);
         $cold_sn_str = implode(",", array_map(function ($ele){return $ele->GRD_COLD_SN;}, $grd_info));