diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index da233e28..46d63c22 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -110,6 +110,7 @@ class TulanduoApi extends CI_Controller } $cnt = 0; $pag_no_tmp = $this->pag_no_tmp(); + mb_regex_encoding("UTF-8"); foreach ($all_list as $k => $vo) { $vo['agcOrderNo'] = mb_ereg_replace('(\s| )', '', $vo['agcOrderNo']); // 去掉中文的全角空格 $PAG_Code = $pag_sub = null; @@ -133,7 +134,6 @@ class TulanduoApi extends CI_Controller $this->Orders_model->BIZ_COLI_SN = $this->Orders_model->GRI_SN = $this->Orders_model->GCI_SN = null; $this->Orders_model->get_SN_by_vendorOrderId($vo['orderId']); // 查询订单是否已经录入过 - mb_regex_encoding("UTF-8"); if ($this->Orders_model->BIZ_COLI_SN === null && in_array($vo['agcName'], array("D目的地桂林组"))) { $tmp_groupCode = explode("-", $vo['agcOrderNo']); $real_groupCode = $tmp_groupCode[0] . "-"; @@ -153,7 +153,7 @@ class TulanduoApi extends CI_Controller $date_diff = $travelDate->diff($leaveDate); $this->Orders_model->GRI_No = $vo['agcOrderNo']; $this->Orders_model->GRI_OrderType = 227002; // 商务 - $this->Orders_model->GRI_Name = ""; + $this->Orders_model->GRI_Name = $vo["agcName"] . $vo['agcOrderNo']; $this->Orders_model->GRI_PersonNum = $vo['adultNum']+$vo['childNum']; $this->Orders_model->GRI_Days = intval($date_diff->format('%R%a')+1); $this->Orders_model->GRI_IsCancel = 0; @@ -235,21 +235,22 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID); log_message('error','TulanduoApi get_orderdetail failed. Msg:' . $detail_jsonResp->errMsg . "; Request: " . $this->tld_order->getBizContent()); return; } - $allDetails_to_HT = "日程: "; - foreach ($detail_jsonResp->orderDetail->scheduleDetails as $vsd) { - $allDetails_to_HT .= $vsd->travelDate .": ". $vsd->title . "; "; - } - $allDetails_to_HT .= "导游: "; - foreach ($detail_jsonResp->orderDetail->operationDetails->guiderOperations as $vg) { - $allDetails_to_HT .= $vg->name ." (". $vg->mobelPhone . "); "; - } + // $allDetails_to_HT = ""; + // $allDetails_to_HT .= "日程: "; + // foreach ($detail_jsonResp->orderDetail->scheduleDetails as $vsd) { + // $allDetails_to_HT .= $vsd->travelDate .": ". $vsd->title . "; "; + // } + // $allDetails_to_HT .= "导游: "; + // foreach ($detail_jsonResp->orderDetail->operationDetails->guiderOperations as $vg) { + // $allDetails_to_HT .= $vg->name ." (". $vg->mobelPhone . "); "; + // } /** HT 开始 */ /** UPDATE */ /** BIZ_ConfirmLineInfo */ $this->Order_update->coli_where_update = " COLI_SN=" . $order->GCI_COLI_SN; $coli_update_column = array( - "COLI_Memo" => $order->COLI_Memo . "\r\n" . $detail_jsonResp->orderDetail->orderRemark - ,"COLI_OrderDetailText" => $order->COLI_OrderDetailText . "\r\n" . $allDetails_to_HT + "COLI_Memo" => $order->COLI_Memo . "\r\n" . $detail_jsonResp->orderDetail->orderRemark . "\r\n" + // ,"COLI_OrderDetailText" => $order->COLI_OrderDetailText . "\r\n" . $allDetails_to_HT . "\r\n" ); $this->Order_update->biz_confirmlineinfo_update($coli_update_column); /** BIZ_ConfirmLineDetail */ // nothing to update @@ -376,7 +377,7 @@ log_message('error','new coli ' . $this->Orders_model->BIZ_COLI_ID); public function order_push($COLI_ID=0) // test { // exit(); - /** test */ + /** 目的地 test */ $this->userId = "358"; $this->key = "a08f26ddc5b1bd4c8e5eafcac28fc1ec"; $this->load->model('TuLanDuo_addOrUpdateRouteOrderContentBuilder', 'tldOrderBuilder');