diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index dba2088a..a33cb823 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -635,6 +635,26 @@ class TulanduoApi extends CI_Controller $this->Orders_model->biz_groupcombineoperationdetail_save(); } } + if (isset($detail_jsonResp->orderDetail->operationDetails->trafficOperations)) { + foreach ($detail_jsonResp->orderDetail->operationDetails->trafficOperations as $vto) { + $this->Orders_model->GCOD_GCI_combineNo = $detail_jsonResp->orderDetail->groupOrderNo ; + $this->Orders_model->GCOD_VEI_SN = $vei_SN; + $this->Orders_model->GCOD_operationType = "trafficOperations"; + $this->Orders_model->GCOD_subType = $vto->birthland . " " . $vto->destination; + $this->Orders_model->GCOD_title = $vto->trafficNo; + $this->Orders_model->GCOD_dutyName = ""; + $this->Orders_model->GCOD_dutyTel = ""; + $this->Orders_model->GCOD_dutyPhoto = ''; + $this->Orders_model->GCOD_startDate = $vto->useDate; + $this->Orders_model->GCOD_endDate = ""; + $this->Orders_model->GCOD_sumMoney = $vto->sumMoney; + $this->Orders_model->GCOD_carLicense = ""; + $this->Orders_model->GCOD_standard = ""; + $this->Orders_model->GCOD_remark = $vto->remark; + $this->Orders_model->GCOD_useNum = $vto->useNum; + $this->Orders_model->biz_groupcombineoperationdetail_save(); + } + } } $output_text = "Got order operations from TuLanDuo:" . $detail_jsonResp->orderDetail->orderId . ". " . $coli_id; log_message('error', $output_text); diff --git a/webht/third_party/trippestOrderSync/models/orderFinance_model.php b/webht/third_party/trippestOrderSync/models/orderFinance_model.php index fd3ebe2d..91a46b4e 100644 --- a/webht/third_party/trippestOrderSync/models/orderFinance_model.php +++ b/webht/third_party/trippestOrderSync/models/orderFinance_model.php @@ -116,6 +116,9 @@ class OrderFinance_model extends CI_Model { } elseif ($value->GCOD_operationType=='otherCosts' && $value->GCOD_subType=='餐补（司陪）') { $ret->cost_category['guide_meal'] += $value->cost; continue; + } elseif ($value->GCOD_operationType=='trafficOperations') { + $ret->cost_category['otherCosts'] += $value->cost; + continue; } $ret->cost_category[$value->GCOD_operationType] += $value->cost; } diff --git a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php index 2c71b0f6..63ade2fb 100644 --- a/webht/third_party/vendorPlanSync/controllers/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/controllers/Tulanduo.php @@ -47,10 +47,10 @@ class Tulanduo extends CI_Controller // test // public $list_url = "http://dj.ltsoftware.net:9901/action/api/searchRouteOrder/"; // public $detail_url = "http://dj.ltsoftware.net:9901/action/api/detailRouteOrder/"; - public $neworder_url = "http://dj.ltsoftware.net:9901/action/api/addOrUpdateRouteOrder/"; + public $neworder_url = "http://ltdj.ltsoftware.net:19919/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/"; + // public $list_url = "http://djb3c.ltsoftware.net:9921/action/api/searchRouteOrder/"; + // public $detail_url = "http://djb3c.ltsoftware.net:9921/action/api/detailRouteOrder/"; // public $neworder_url = "http://djb3c.ltsoftware.net:9921/action/api/addOrUpdateRouteOrder/"; public function __construct(){ @@ -63,9 +63,11 @@ class Tulanduo extends CI_Controller $this->load->model('BIZ_orders_model', 'BIZ_order'); // $this->load->model('TuLanDuo_queryContentBuilder', 'tld_order'); // $this->output->enable_profiler(TRUE); - /** test */ - $this->userId = "358"; - $this->key = "a08f26ddc5b1bd4c8e5eafcac28fc1ec"; + /** test + 902 key:f56541ff40e1afba444d831c5a666195 + */ + $this->userId = "902"; + $this->key = "f56541ff40e1afba444d831c5a666195"; /** Live */ // 目的地 // $this->userId = "1134"; @@ -111,8 +113,8 @@ class Tulanduo extends CI_Controller { // exit(); /** 目的地 test */ - $this->userId = "358"; - $this->key = "a08f26ddc5b1bd4c8e5eafcac28fc1ec"; + $this->userId = "902"; + $this->key = "f56541ff40e1afba444d831c5a666195"; $this->load->model('TuLanDuo_addOrUpdateRouteOrderContentBuilder', 'tldOrderBuilder'); $orderinfo = $this->BIZ_order->get_orderinfo_detail($gri_sn); if(empty($orderinfo)) {return;} @@ -252,15 +254,41 @@ class Tulanduo extends CI_Controller $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]['content'] .= $this_title . $this_content; } } - foreach (array_values($schedule_obj) as $kso => $vso) { - $this->tldOrderBuilder->setScheduleDetailsTitle($kso, $vso['date']) - ->setScheduleDetailsContent($kso, $vso['content']) - ->setScheduleDetailsAccommodation($kso, $vso['accommodation']) - // ->setScheduleDetailsTraffic($kso, ($vso->PAG_Vehicle>60001 ? 1 : 0)) - ->setScheduleDetailsBreakFirst($kso, 0 ) - ->setScheduleDetailsDinner($kso, $vso['dinner'] ) - ->setScheduleDetailsLunch($kso, $vso['lunch']) - ; + // 补全空的日期 + $first_date = strstr($vf["cold"][0]->COLD_StartDate, " ", true); + $date1 = new DateTime($first_date); + $date_end = new DateTime($end_date); + $date_diff = $date_end->diff($date1); + $d = ($date_diff->format("%d")); + $all_date = array(); + for ($j=0; $j < ($d+1); $j++) { + $all_date[] = date('Y-m-d', strtotime("+$j day", strtotime($first_date))); + } + $real_date = array_column(array_values($schedule_obj), 'date'); + foreach ($all_date as $kd => $vd) { + if ( ! in_array($vd, $real_date)) { + $this->tldOrderBuilder->setScheduleDetailsTitle($kd, $vd) + ->setScheduleDetailsContent($kd, "无") + ->setScheduleDetailsAccommodation($kd, "") + // ->setScheduleDetailsTraffic($kd, ($vso->PAG_Vehicle>60001 ? 1 : 0)) + ->setScheduleDetailsBreakFirst($kd, 0 ) + ->setScheduleDetailsDinner($kd, 0) + ->setScheduleDetailsLunch($kd, 0) + ; + continue; + } + foreach (array_values($schedule_obj) as $kso => $vso) { + if ($vd==$vso['date']) { + $this->tldOrderBuilder->setScheduleDetailsTitle($kd, $vso['date']) + ->setScheduleDetailsContent($kd, $vso['content']) + ->setScheduleDetailsAccommodation($kd, $vso['accommodation']) + // ->setScheduleDetailsTraffic($kd, ($vso->PAG_Vehicle>60001 ? 1 : 0)) + ->setScheduleDetailsBreakFirst($kd, 0 ) + ->setScheduleDetailsDinner($kd, $vso['dinner'] ) + ->setScheduleDetailsLunch($kd, $vso['lunch']) + ; + } + } } // 拆分的订单团款录第一个 if ($i===1) { @@ -273,10 +301,10 @@ class Tulanduo extends CI_Controller ->setTravelFeesRemark($kf, $vf->GAI_Memo); } } - echo(($this->tldOrderBuilder->getBizContent()));return; - // $this->output->set_content_type('application/json')->set_output($this->tldOrderBuilder->getBizContent()); - // var_dump(($this->tldOrderBuilder->getBizContent())); - // $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder); + // echo(($this->tldOrderBuilder->getBizContent())); + $this->output->set_content_type('application/json')->set_output($this->tldOrderBuilder->getBizContent()); + $resp = $this->excute_curl($this->neworder_url, $this->tldOrderBuilder); + var_dump($resp); /** BIZ_GroupCombineInfo */ // if (json_decode($resp)->status == 1) { // log_message('error','in GCI ' . json_decode($resp)->responseData->orderId); @@ -288,7 +316,7 @@ class Tulanduo extends CI_Controller // } } // email 供应商 todo - // echo "Order Push done."; + echo "Order Push done."; return; }