diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index fff3a8e5..04ce6d93 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -471,12 +471,16 @@ log_message('error',$resp); $extra_day = $this->ci->trippest->special_route[$vf["cold"][0]->pag_code]["day"]-1; $end_date = date("Y-m-d", strtotime("+$extra_day day", strtotime($vf["cold"][0]->COLD_StartDate))); } - $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code; + // $agcOrderNo = $vf["cold"][0]->COLI_GroupCode . "-" . $vf["package_info"][0]->city_code; if ($take_apart===true) { - $agcOrderNo .= "-" . $i; + // $agcOrderNo .= "-" . $i; $tour_code = mb_strtoupper($vf["cold"][0]->pag_code); } - $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")"; + // $agcOrderNo .= "(" . $vf["cold"][0]->operator . ")"; + $agcOrderNo = $vf["cold"][0]->COLI_GroupCode; + if (trim($vf["cold"][0]->COLI_PriceMemo) !== '') { + $agcOrderNo .= " (" . $vf["cold"][0]->COLI_PriceMemo . ")"; + } $order_remark = ""; if ($i===1) { // 只写一次备注.备注中可能包含代收信息,避免多次收取 $order_remark_arr = array_filter(array_map( function($element){return $element->COLD_vendorMemo;}, $vf["cold"] )) ; @@ -604,7 +608,7 @@ log_message('error',$resp); $date_e = new DateTime(strstr($vs->COLD_EndDate, " ", TRUE)); $date_d = $date_e->diff($date_s); $d_t = ($date_d->format("%a")); - if ($d_t > 0) { + if ($d_t > 0 && empty($fill_date)) { for ($d_i=0; $d_i < ($d_t+1); $d_i++) { $f_d = date('Y-m-d', strtotime("+$d_i day", strtotime(substr($vs->COLD_StartDate, 0, 10)))); $schedule_obj[$f_d] = $schedule_obj[substr($vs->COLD_StartDate, 0, 10)]; diff --git a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php index eb7bb473..bf27da86 100644 --- a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php +++ b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php @@ -118,12 +118,12 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model } public function setRoomStandard($roomStandard) { - $this->orderData['roomStandard'] = $roomStandard; + $this->orderData['roomStandard'] = isset($this->orderData['roomStandard']) ? ($this->orderData['roomStandard'] . "\r\n" . $roomStandard) : $roomStandard; return $this; } public function setOrderRemark($orderRemark) { - $this->orderData['orderRemark'] = $orderRemark; + $this->orderData['orderRemark'] = isset($this->orderData['orderRemark']) ? ($this->orderData['orderRemark'] . "\r\n" . $orderRemark) : $orderRemark; return $this; } public function setRouteStandard($routeStandard) @@ -133,7 +133,7 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model } public function setDestination($destination) { - $this->orderData['destination'] = $destination; + $this->orderData['destination'] = $destination . "分公司"; return $this; } public function setTravelDate($travelDate)