From 5fcf2aa43f0372f6dd33c3239d89e30ccaa2d7db Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 13 Jun 2019 10:41:44 +0800 Subject: [PATCH 1/2] 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; From 2e0a3cac9a4935aac5d9de66517a0bffad0b771c Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 13 Jun 2019 11:30:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddistinct=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/vendor_money_model.php | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 374b9c8e..99e606b0 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -126,26 +126,30 @@ class Vendor_money_model extends CI_Model { public function vendor_cost($vendor_str, $start_date, $end_date) { - $sql = "SELECT group_cost.GCI_VEI_SN vendor_code, - SUM(group_cost.cost) vendor_cost - FROM - (SELECT DISTINCT gci.GCI_combineNo, - (SELECT SUM(CONVERT(float, gcod.GCOD_sumMoney)) + $sql = "SELECT tmp.vendor_code , + SUM(tmp.cost) vendor_cost + from + ( + SELECT group_cost.GCI_VEI_SN vendor_code, + (SELECT SUM(CONVERT(float, gcod.GCOD_sumMoney)) FROM GroupCombineOperationDetail gcod WHERE gcod.GCOD_GCI_combineNo=GCI_combineNo - AND gcod.GCOD_operationType <> 'otherReceives' ) AS cost , - GCI_VEI_SN - FROM GroupCombineInfo gci - WHERE 1=1 - AND GCI_VEI_SN IN ($vendor_str) - AND EXISTS - ( SELECT 1 - FROM CK_GroupInfo - WHERE CGI_Checked=1 - AND CGI_GRI_SN=GCI_GRI_SN - AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date') - ) AS group_cost - GROUP BY group_cost.GCI_VEI_SN"; + AND gcod.GCOD_operationType <> 'otherReceives' ) AS cost + FROM + (SELECT DISTINCT gci.GCI_combineNo, + GCI_VEI_SN + FROM GroupCombineInfo gci + WHERE 1=1 + AND GCI_VEI_SN IN ($vendor_str) + AND EXISTS + ( SELECT 1 + FROM CK_GroupInfo + WHERE CGI_Checked=1 + AND CGI_GRI_SN=GCI_GRI_SN + AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date') + ) AS group_cost + ) as tmp + GROUP BY tmp.vendor_code "; $query = $this->HT->query($sql); return $query->result_array(); }