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; }