From 0a9bd19874a54f1fe856b736db940447161925dc Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 21 Jun 2019 15:57:58 +0800 Subject: [PATCH] =?UTF-8?q?Trippest=E7=94=9F=E6=88=90=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E8=A1=A8:=E6=95=B0=E6=8D=AE=E5=BA=93=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/order_finance.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/order_finance.php b/webht/third_party/trippestOrderSync/controllers/order_finance.php index 0b37e211..da071d8a 100644 --- a/webht/third_party/trippestOrderSync/controllers/order_finance.php +++ b/webht/third_party/trippestOrderSync/controllers/order_finance.php @@ -156,7 +156,7 @@ class Order_finance extends CI_Controller { $report_tour_pvt = array(); $report_tour_pvt['ordernumber'] = $cpvt->coli_id; $report_tour_pvt['tourCode'] = mb_substr($cpvt->PAG_Code, 0, 50); - $report_tour_pvt['tourname'] = substr($cpvt->pag_name, 0, 200); + $report_tour_pvt['tourname'] = mb_substr($cpvt->pag_name, 0, 200); $report_tour_pvt['tourtime'] = $cpvt->startdate; $report_tour_pvt['tourRSd'] = $cpvt->adult_num; $report_tour_pvt['tourRSx'] = $cpvt->child_num; @@ -417,7 +417,7 @@ class Order_finance extends CI_Controller { $this_order_real_pag_sns = array_map(function($ele) {return $ele->real_pag_sn;}, $ret->order_cost); $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', array_unique(array_filter($this_order_real_pag_sns)))); // $pag_sns $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ; - $ret->pag_name = implode(";\r\n", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; + $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; $ret->PAG_Code = implode(",", $ret->combine_pags); $ret->comment = "拼团" . $combineNo . ", 按" . $ret->person_num . "人等"; $ret->comment .= $ret->totalPrice_RMB>0 ? (", 报价RMB " . $ret->totalPrice_RMB) : ""; @@ -486,7 +486,7 @@ class Order_finance extends CI_Controller { $pags_info = $this->OrderFinance_model->get_pag_info(implode(',', $pag_sns)); $ret->PAG_Code = implode(",", array_values(array_unique(array_map(function($ele) {return mb_strtoupper($ele->PAG_Code);}, $pags_info)))); $ret->vendor_name = implode(",", array_values(array_unique(array_map(function($ele) {return $ele->VEI2_CompanyBN;}, $pags_info)))) ; - $ret->pag_name = implode(";\r\n", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; + $ret->pag_name = implode("; ", array_map(function($ele) {return $ele->PAG_Title;}, $pags_info)) ; if ($debug!=false) { return $this->output->set_content_type('application/json')->set_output(json_encode($ret)); }