From 5fcf2aa43f0372f6dd33c3239d89e30ccaa2d7db Mon Sep 17 00:00:00 2001
From: lyt <lyt@hainatravel.com>
Date: Thu, 13 Jun 2019 10:41:44 +0800
Subject: [PATCH] merge from master

---
 .../trippestOrderSync/controllers/api.php        | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/webht/third_party/trippestOrderSync/controllers/api.php b/webht/third_party/trippestOrderSync/controllers/api.php
index f235f9a6..6fe3f973 100644
--- a/webht/third_party/trippestOrderSync/controllers/api.php
+++ b/webht/third_party/trippestOrderSync/controllers/api.php
@@ -317,6 +317,11 @@ class Api extends CI_Controller {
                         // $vro['drop_off'] .= $poi->POI_FlightsNo . " " . $poi->POI_AirPort; // 结束后送机
                     }
                 }
+                $vro['leader_name'] = mb_convert_encoding($vro['leader_name'], "UTF-8");
+                $vro['hotel_name'] = mb_convert_encoding($vro['hotel_name'], "UTF-8");
+                $vro['hotel_address'] = mb_convert_encoding($vro['hotel_address'], "UTF-8");
+                $vro['pick_up'] = mb_convert_encoding($vro['pick_up'], "UTF-8");
+                $vro['drop_off'] = mb_convert_encoding($vro['drop_off'], "UTF-8");
                 $num_index++;
             }
             unset($vro);
@@ -362,8 +367,8 @@ class Api extends CI_Controller {
                 $vro['adult_number'] = $order_project[0]->COLD_PersonNum;
                 $vro['kid_number'] = $order_project[0]->COLD_ChildNum;
                 // 酒店
-                $vro['hotel_name'] = $poi->POI_Hotel;
-                $vro['hotel_address'] = $poi->POI_HotelAddress;
+                $vro['hotel_name'] = mb_convert_encoding($poi->POI_Hotel, "UTF-8");
+                $vro['hotel_address'] = mb_convert_encoding($poi->POI_HotelAddress, "UTF-8");
                 $vro['hotel_tel'] = $poi->POI_HotelPhone;
                 // 航班/车次
                 $vro['flights_no'] = $poi->POI_FlightsNo;
@@ -393,6 +398,11 @@ class Api extends CI_Controller {
                         // $vro['drop_off'] .= $poi->POI_FlightsNo . " " . $poi->POI_AirPort; // 结束后送机
                     }
                 }
+                $vro['leader_name'] = mb_convert_encoding($vro['leader_name'], "UTF-8");
+                $vro['hotel_name'] = mb_convert_encoding($vro['hotel_name'], "UTF-8");
+                $vro['hotel_address'] = mb_convert_encoding($vro['hotel_address'], "UTF-8");
+                $vro['pick_up'] = mb_convert_encoding($vro['pick_up'], "UTF-8");
+                $vro['drop_off'] = mb_convert_encoding($vro['drop_off'], "UTF-8");
                 $ret['operation'][] = $vro;
             }
         }
@@ -418,7 +428,7 @@ class Api extends CI_Controller {
         }
         $operator = $this->Orders_model->get_operator($raw_opi_id);
         if ( ! empty($operator)) {
-            $ret['operator']['chinese_name'] = $operator->OPI_Name;
+            $ret['operator']['chinese_name'] = mb_convert_encoding($operator->OPI_Name, "UTF-8");
             $ret['operator']['mobile'] = $operator->OPI_MoveTelephone;
             $ret['operator']['email'] = $operator->OPI_Email;
             $ret['operator']['english_name'] = $operator->OPI2_Name;