|
@@ -401,7 +401,8 @@ function selseat(seat){
});
people_sn=people_sn.substring(1);
- var istanding = $('input[name="istanding"]').is(':checked');
+ var cold_sn = $(this).attr('data-order');
+ var istanding = $('input[name="istanding_'+cold_sn+'"]').is(':checked');
url2+=$(this).attr("data-order")+"&people="+people_sn+"&selectseat="+selectseat+"&type=juhe&istanding="+istanding;
diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
index c7338520..33e91b1b 100644
--- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
+++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php
@@ -111,7 +111,9 @@ class Tulanduo
return false;
}
$guestlist = $this->ci->orders_model->get_customer_list($gri_sn);
- $request_info = $this->ci->Group_model->get_plan_request($vas->GRI_SN);
+ $request_info = $this->ci->Group_model->get_plan_request($gri_sn);
+ $plan_remark = $this->ci->Group_model->get_plan_remark($gri_sn, $vei_sn);
+ $plan_remark = strval($plan_remark)==='' ? '' : "请导游准备: " . $plan_remark;
/**
* TODO:团队类型? 先写2
* ??是否同一天含多个包价项目
@@ -129,7 +131,7 @@ class Tulanduo
$big_order_index = 0;
$expect_order_cnt = count($grd_apart_info['com'])+intval(!empty($grd_apart_info['big_pvt']))+intval(!empty($grd_apart_info['pvt']));
foreach ($grd_apart_info as $group_key => $grd_a) {
- $big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, $guestlist, $grd_a, $big_order_index);
+ $big_order_index = $this->tour_apart_order_exec($group_key, $vas, $request_info, $guestlist, $grd_a, $big_order_index, $plan_remark);
}
if ($big_order_index === $expect_order_cnt) {
/** VendorArrangeState VAS_IsReceive */
@@ -143,18 +145,25 @@ class Tulanduo
* @Date: 2019-05-30 16:11:34
* @Desc: 执行发送订单计划信息. 参数已拆分归类好的行程
*/
- public function tour_apart_order_exec($group_type, $vas, $request_info, $guestlist=null, $grd, $total_order_index)
+ public function tour_apart_order_exec($group_type, $vas, $request_info, $guestlist=null, $grd, $total_order_index, $plan_remark=null)
{
if (empty($grd)) {
return $total_order_index;
}
$userId = $this->send_host["1"]["userId"];
$userKey = $this->send_host["1"]["key"];
+ $destination = $grd['details'][0]->tocity;
+ $destination_code = $grd['details'][0]->citycode;
+ if (empty($destination)) {
+ $vendor_city = $this->ci->Group_model->get_vendor_city($vas->VAS_VEI_SN);
+ $destination = $vendor_city->cityname;
+ $destination_code = $vendor_city->citycode;
+ }
switch ($group_type) {
case 'big_pvt':
$total_order_index ++;
$all_grd = array($grd);
- $routeName = "中华游" . $grd['details'][0]->tocity . "常规线路";
+ $routeName = "中华游" . $destination . "常规线路";
$routeType = $routeName;
$agcOrderNo = $vas->GRI_Name;
// $agcOrderNo .= "(" . $vas->operator . ")";
@@ -165,7 +174,7 @@ class Tulanduo
$all_grd = array($grd);
$routeName = empty($grd['details'][0]->GRD_Landscape) ? $grd['details'][0]->PAG_Title : $grd['details'][0]->GRD_Landscape;
$routeName .= "(" . $grd['details'][0]->PAG_Code . ")";
- $routeType = $grd['details'][0]->tocity . "目的地线路";
+ $routeType = $destination . "目的地线路";
$agcOrderNo = $vas->GRI_Name;
// $agcOrderNo .= "(" . $vas->operator . ")";
$order_type = 1;
@@ -183,7 +192,7 @@ class Tulanduo
if (empty($routeName)) {
$routeName = $vo['details'][0]->GRD_Landscape . "(" . $vo['details'][0]->PAG_Code . ")";
}
- $routeType = $vo['details'][0]->tocity . "目的地线路";
+ $routeType = $destination . "目的地线路";
$agcOrderNo = $vas->GRI_Name;
// $agcOrderNo .= "(" . $vas->operator . ")";
}
@@ -199,24 +208,53 @@ class Tulanduo
->setAgcOrderNo($agcOrderNo)
->setAdultNum(intval($vo['details'][0]->ACI_PersonNum))
->setChildNum(intval(bcadd($vo['details'][0]->ACI_ChildNum, $vo['details'][0]->ACI_BabyNum)))
- ->setDestination($vo['details'][0]->tocity)
+ ->setDestination($destination)
->setTravelDate($first_date)
->setLeavedDate($end_date)
- // ->setOrderRemark($order_remark) // 订单备注 TODO:
// ->setRoomStandard($request_info->GCI_HotelRequest) // 住房标准
->setRouteStandard($request_info->GCI_Request) // 行程服务标准
;
+ // 订单备注
+ if (strval($plan_remark) !== '') {
+ $this->ci->tldOrderBuilder->setOrderRemark($plan_remark);
+ }
+ $from_country = ""; // 客源地
if ($guestlist===null) {
+ // 商务订单的客人列表
$g_cold_str = array_map(function ($ele){return $ele->GRD_COLD_SN;}, $vo['details']);
$guestlist = $this->ci->BIZ_order->get_guestlist(implode(',',$g_cold_str));
+ $from_country = current(array_filter(array_map(function ($ele){return $ele->Country;},$guestlist)));
+ // 联系人
+ $biz_contact = $this->ci->BIZ_order->get_customer_contact(implode(',',$g_cold_str));
+ $guestlist[0]->phone = $biz_contact->phone;
+ if (strval($from_country)==='') {
+ $from_country = $biz_contact->Country;
+ }
}
foreach ($guestlist as $key => $vg) {
+ $this_otherinfo = "";
$this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
->setCustomersPeopleType($key, (calc_age_type($vg->BirthDay)==1 ? "成人" : "儿童"))
->setCustomersDocumentType($key, "护照") // Passport No.
->setCustomersDocumentNo($key, $vg->PassportNo)
- ->setCustomersOtherInfo($key, $vg->Country . "; " . $vg->phone);
+ ->setCustomersPhoneNo($key, $vg->phone);
+ if (strval($vg->Country) !== '') {
+ $this_otherinfo .= $vg->Country;
+ $from_country = strval($from_country) === '' ? $vg->Country : $from_country;
+ }
+ if (strval($vg->Gender) !== '') {
+ $this_otherinfo .= "; " . $vg->Gender;
+ }
+ if (strval($vg->BirthDay) !== '') {
+ $this_otherinfo .= "; 生日:". $vg->BirthDay;
+ }
+ if (strval($vg->PassportValidDate) !== '') {
+ $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
+ }
+ $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
}
+ // 客源地
+ $this->ci->tldOrderBuilder->setCustomerFromCity($from_country);
// 补全空的日期,行程为空
$date1 = new DateTime($first_date);
$date_end = new DateTime($end_date);
@@ -245,12 +283,21 @@ class Tulanduo
->setScheduleDetailsContent($kd,
$vgrd->GRD_LeaveCity . "-" . $vgrd->GRD_ServiceCity . "\r\n" .
$vgrd->GRD_Landscape . "\r\n" . $vgrd->GRD_Traffic)
- ->setScheduleDetailsAccommodation($kd, $vgrd->GRD_Hotel)
->setScheduleDetailsTraffic($kd, ($vgrd->GRD_Traffic))
->setScheduleDetailsBreakFirst($kd, 0 )
->setScheduleDetailsDinner($kd, (trim($vgrd->GRD_Meal_S)==="" ? 0 : 1 ))
->setScheduleDetailsLunch($kd, (trim($vgrd->GRD_Meal_L)==="" ? 0 : 1 ))
;
+ // 酒店只写名字在线路信息中
+ if (isset($vgrd->hotel_name) && strval($vgrd->hotel_name)!=='') {
+ $this->ci->tldOrderBuilder->setScheduleDetailsAccommodation($kd, $vgrd->hotel_name);
+ } else {
+ $this->ci->tldOrderBuilder->setScheduleDetailsAccommodation($kd, $vgrd->GRD_Hotel);
+ }
+ if (strval($vgrd->GRD_Hotel) !=='' ) {
+ $this->ci->tldOrderBuilder->setRoomStandard($vgrd->GRD_OrderDate . " " . trim($vgrd->GRD_Hotel));
+ }
+ // 商务订单信息
if (isset($vgrd->hotel_checkin)) {
$this->ci->tldOrderBuilder->setRoomStandard(trim($vgrd->hotel_checkin));
}
@@ -405,7 +452,7 @@ class Tulanduo
}
if ( ! empty($train_coldsn_arr)) {
$route_name .= $route_name==="" ? "" : "+";
- $route_name .= "火车票预订";
+ $route_name .= "单订国际列车票服务";
$order_type = 1;
$train_order = $this->ci->BIZ_order->get_train_flight_order(implode(',', $train_coldsn_arr));
$agcOrderNo = $vas->GRI_Name;
@@ -416,7 +463,7 @@ class Tulanduo
->setKey($userKey)
->setOrderType($order_type)
->setRouteName($route_name)
- ->setRouteType("火车票预订")
+ ->setRouteType("单订国际列车票服务")
->setAgcOrderNo($agcOrderNo)
->setAdultNum($train_order[0]->adult_num)
->setChildNum($train_order[0]->child_num)
@@ -426,14 +473,28 @@ class Tulanduo
;
$train_guest_list = $this->ci->BIZ_order->get_guestlist(implode(',', $train_coldsn_arr));
// 客人列表
+ $from_country = ""; // 客源地
foreach ($train_guest_list as $key => $vg) {
$this_otherinfo = "";
- $this->ci->tldOrderBuilder->setCustomersName($key, $vg->BPE_FirstName . " " . $vg->BPE_LastName )
+ $this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童"))
->setCustomersDocumentType($key, "护照") // Passport No.
- ->setCustomersDocumentNo($key, $vg->BPE_Passport)
+ ->setCustomersDocumentNo($key, $vg->PassportNo)
;
- $this_otherinfo .= $this->ci->BIZ_order->GetNationalityName($vg->BPE_Nationality);
+ if (strval($vg->Country) !== '' ) {
+ $from_country = strval($from_country) === '' ? $vg->Country : $from_country;
+ $this_otherinfo .= $vg->Country;
+ }
+ if (strval($vg->Gender) !== '') {
+ $this_otherinfo .= "; " . $vg->Gender;
+ }
+ if (strval($vg->BirthDay) !== '') {
+ $this_otherinfo .= "; 生日:". $vg->BirthDay;
+ }
+ if (strval($vg->PassportValidDate) !== '') {
+ $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
+ }
+ $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
// todo:电话
// if (trim($vf['cold'][0]->GUT_TEL) != "" && $key===0) {
// $this_otherinfo .= "; 电话:";
@@ -442,6 +503,7 @@ class Tulanduo
// $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
// }
}
+ $this->ci->tldOrderBuilder->setCustomerFromCity($from_country);
$s_index = 0;
foreach ($train_order as $train) {
$this_content = '';
@@ -704,21 +766,40 @@ class Tulanduo
// ->setBackTraffic($backTraffic)
;
// 客人列表
+ $from_country = '';
foreach ($guestlist as $key => $vg) {
$this_otherinfo = "";
- $this->ci->tldOrderBuilder->setCustomersName($key, $vg->BPE_FirstName . " " . $vg->BPE_LastName )
+ $this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童"))
->setCustomersDocumentType($key, "护照") // Passport No.
- ->setCustomersDocumentNo($key, $vg->BPE_Passport)
+ ->setCustomersDocumentNo($key, $vg->PassportNo)
;
- $this_otherinfo .= $this->ci->BIZ_order->GetNationalityName($vg->BPE_Nationality);
if (trim($vf['cold'][0]->GUT_TEL) != "" && $key===0) {
- $this_otherinfo .= "; 电话:";
$this_otherinfo .= trim($vf["cold"][0]->GUT_POST)!=="" ? "+".trim($vf["cold"][0]->GUT_POST) : "" ;
$this_otherinfo .= " " . trim($vf["cold"][0]->GUT_TEL);
- $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
+ $this->ci->tldOrderBuilder->setCustomersPhoneNo($key, $this_otherinfo);
}
+ if ( strval($vg->Country) !== '') {
+ $from_country = strval($from_country) === '' ? $vg->Country : $from_country;
+ $this_otherinfo .= "; " . $vg->Country;
+ }
+ if (strval($vg->Gender) !== '') {
+ $this_otherinfo .= "; " . $vg->Gender;
+ }
+ if (strval($vg->BirthDay) !== '') {
+ $this_otherinfo .= "; 生日:". $vg->BirthDay;
+ }
+ if (strval($vg->PassportValidDate) !== '') {
+ $this_otherinfo .= "; 护照有效期:" . $vg->PassportValidDate;
+ }
+ $this->ci->tldOrderBuilder->setCustomersOtherInfo($key, $this_otherinfo);
+ }
+ // 客源地
+ if (strval($from_country)==='') {
+ $biz_contact = $this->ci->BIZ_order->get_customer_contact($COLD_SN_str);
+ $from_country = $biz_contact->Country;
}
+ $this->ci->tldOrderBuilder->setCustomerFromCity($from_country);
$scheduleDetails = $this->ci->BIZ_order->get_scheduleDetails($COLD_SN_str);
$schedule_obj = array();
foreach ($scheduleDetails as $ks => $vs) {
@@ -872,7 +953,7 @@ class Tulanduo
->setTravelFeesRemark($fee_index, "代收; " . $replace_collections->ALL_Memo);
}
}
- // 查询是否变更 TODO: deprecated
+ // 查询是否变更 deprecated
$sync_orderstate = 10;
$vps_sn = 0;
$vendor_orderid = 0;
diff --git a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
index 09d6f87a..9b0068c3 100644
--- a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
+++ b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php
@@ -37,7 +37,7 @@ class BIZ_Orders_model extends CI_Model {
public function get_guestlist($COLD_SN_str)
{
$sql = "SELECT
- BPE.BPE_FirstName+' '+BPE.BPE_MiddleName+' '+BPE.BPE_LastName as MemberName,
+ isnull(BPE.BPE_FirstName,'') +' '+isnull(BPE.BPE_MiddleName,'') +' '+isnull(BPE.BPE_LastName ,'') as MemberName,
BPE.BPE_BirthDate BirthDay,
ISNULL((select SYC2_CodeDiscribe
from V_System_Code
@@ -331,7 +331,7 @@ class BIZ_Orders_model extends CI_Model {
,f.adultcost
,f.TicketAddress
,cold.COLD_PersonNum as adult_num
- ,cold.COLD_ChildNum+cold.COLD_BabyNum as child_num
+ ,isnull(cold.COLD_ChildNum,0)+isnull(cold.COLD_BabyNum,0) as child_num
,cold.COLD_StartDate,cold.COLD_EndDate
,(select CII2_Name from CItyInfo2
inner join VEndorInfo on VEI_CII_Name=CII2_CII_SN
@@ -381,4 +381,30 @@ class BIZ_Orders_model extends CI_Model {
where p.PAGS_SN=$PAGS_SN ";
return $this->HT->query($sql)->row();
}
+
+ /*!
+ * @Author: LYT
+ * @Date: 2019-06-25 10:12:52
+ * @Desc: 商务订单联系人信息
+ */
+ public function get_customer_contact($COLD_SN_str)
+ {
+ $sql = "SELECT
+ isnull(GUT_FirstName,'') + ' '+isnull(GUT_LastName,'') as MemberName,
+ '' as BirthDay,
+ '' as Gender,
+ isnull(GUT_POST ,'') + ' ' + isnull(GUT_tel,'') + isnull(GUT_MoveTel,'') as phone,
+ (select COI2_Country from V_Country_Info
+ where LGC_LGC = 2
+ and COI_SN = GUT_NationalityID
+ ) as Country,
+ GUT_Passport as PassportNo,
+ '' as PassportValidDate
+ --,BIZ_GUEST.*
+ from BIZ_GUEST
+ inner join BIZ_ConfirmLineInfo on COLI_GUT_SN=GUT_SN
+ inner join BIZ_ConfirmLineDetail on COLI_SN=COLD_COLI_SN
+ where COLD_SN IN ($COLD_SN_str) ";
+ return $this->HT->query($sql)->row();
+ }
}
diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php
index 531663e5..40ed0810 100644
--- a/webht/third_party/vendorPlanSync/models/Group_model.php
+++ b/webht/third_party/vendorPlanSync/models/Group_model.php
@@ -53,39 +53,14 @@ class Group_model extends CI_Model {
public function get_vendor_plan_info($gri_sn, $vendor_id, $from_cold=false)
{
- // SET NOCOUNT ON 才能这样调用, 否则需要遍历结果集
- // $sql = " Tourmanager.dbo.SP_VendorPlan_GetPlanInfo ?, ?, 0 ";
- // $grd_info = $this->HT->query($sql, array($gri_sn, $vendor_id))->result();
- include('c:/database_conn.php');
- $connection = array(
- 'UID' => $db['HT']['username'],
- 'PWD' => $db['HT']['password'],
- 'Database' => 'tourmanager',
- 'ConnectionPooling' => 1,
- 'CharacterSet' => 'utf-8',
- 'ReturnDatesAsStrings' => 1
- );
- $conn = sqlsrv_connect($db['HT']['hostname'], $connection);
- $stmt = sqlsrv_query($conn, "SET NOCOUNT ON;EXEC Tourmanager.dbo.SP_VendorPlan_GetPlanInfo $gri_sn, $vendor_id, 0 ");
- $result_object = array();
- if (false !== $stmt ) { // 无权限或执行错误返回false
- // 存储过程中每个select都产生结果集
- // 设置了SET NOCOUNT ON;就只有输出的结果集
- $a = true;
- while ($a !== false) {
- $row = sqlsrv_fetch_object($stmt); // Retrieves the next row of data as a PHP object.
- $a = !empty($row);
- $a===true ? $result_object[] = $row : null;
- }
- sqlsrv_free_stmt($stmt);
- }
- sqlsrv_close($conn);
- $grd_info = $result_object;
+ $sql = "SET NOCOUNT ON;EXEC Tourmanager.dbo.SP_VendorPlan_GetPlanInfo $gri_sn, $vendor_id, 0 ";
+ $grd_info = $this->call_sp_fun($sql);
$all_day_no = array_map(function($ele){return $ele->GRD_DayNo;}, $grd_info);
$day_no_str = implode(",", $all_day_no);
$cold_sn_str = implode(",", array_map(function ($ele){return $ele->GRD_COLD_SN;}, $grd_info));
if ($from_cold===false) {
$all_aci = $this->get_arrange_info($gri_sn, $vendor_id, $day_no_str);
+ $all_hotel = $this->get_arrange_hotel($gri_sn, $day_no_str);
foreach ($grd_info as $kgrd => &$vgrd) {
$vgrd->pag_code_arr = array();
$vgrd->PAG_Title = $vgrd->GRD_Landscape;
@@ -106,6 +81,13 @@ class Group_model extends CI_Model {
}
}
}
+ $vgrd->hotel_name = '';
+ foreach ($all_hotel as $kh => $vh) {
+ if ($vgrd->GRD_DayNo == $vh->ACI_DayNo) {
+ $vgrd->hotel_name = $vh->hotel;
+ break;
+ }
+ }
}
} else {
$all_cold = $this->get_arrange_info_from_biz_cold($cold_sn_str);
@@ -196,6 +178,27 @@ class Group_model extends CI_Model {
return $this->HT->query($sql)->result();
}
+ public function get_arrange_hotel($gri_sn, $day_no="")
+ {
+ $day_no_sql = ($day_no !== "") ? " AND aci.ACI_DayNo IN ($day_no) " : "";
+ $sql = "SELECT
+ aci.ACI_VEI_SN,
+ aci.ACI_SN,
+ aci.ACI_DayNo,
+ (select VEI2_CompanyN from vendorinfo2 where vei2_vei_sn=ACI_serviceSN and VEI2_LGC=2) as hotel,
+ ACI_ServiceType,ACI_ServiceSN,ACI_ServiceSN2,
+ ACI_OrderDate,
+ ACI_Amount
+ -- ,*
+ from ArrangeConfirmInfo aci
+ where 1=1
+ and aci.ACI_GRI_SN=?
+ and aci.ACI_ServiceType = 'A'
+ $day_no_sql
+ order by ACI_DayNo,ACI_SNInOneDay";
+ return $this->HT->query($sql, array($gri_sn))->result();
+ }
+
public function get_sync_info($vas, $tour_code="")
{
$sql = "SELECT *
@@ -364,6 +367,65 @@ class Group_model extends CI_Model {
return $query;
}
+ public function get_vendor_city($vei_sn)
+ {
+ $sql = "SELECT
+ CII_PKCode citycode,CII2_Name cityname
+ from VEndorInfo
+ inner join CItyInfo on CII_SN=VEI_CII_Name
+ inner join CItyInfo2 on CII2_CII_SN=VEI_CII_Name and CII2_LGC=2
+ where VEI_SN=? ";
+ return $this->HT->query($sql, array($vei_sn))->row();
+ }
+
+ /*!
+ * @Author: LYT
+ * @Date: 2019-06-25 14:56:01
+ * @Desc: 生成计划最后的导游备注
+ * @return PHP ArrayObject
+ */
+ public function get_plan_remark($gri_sn, $vei_sn)
+ {
+ $sql = "DECLARE @StrResult varchar(1000);SET NOCOUNT ON;
+ EXEC SP_VendorPlan_GetAddFeeProduct $gri_sn, $vei_sn, @StrResult out
+ SELECT @StrResult as remark
+ ";
+ $result_obj = $this->call_sp_fun($sql);
+ return empty($result_obj) ? '' : $result_obj[0]->remark;
+ }
+
+ public function call_sp_fun($sql)
+ {
+ // SET NOCOUNT ON 才能这样调用, 否则需要遍历结果集
+ // $sql = " Tourmanager.dbo.SP_VendorPlan_GetPlanInfo ?, ?, 0 ";
+ // $grd_info = $this->HT->query($sql, array($gri_sn, $vendor_id))->result();
+ include('c:/database_conn.php');
+ $connection = array(
+ 'UID' => $db['HT']['username'],
+ 'PWD' => $db['HT']['password'],
+ 'Database' => 'tourmanager',
+ 'ConnectionPooling' => 1,
+ 'CharacterSet' => 'utf-8',
+ 'ReturnDatesAsStrings' => 1
+ );
+ $conn = sqlsrv_connect($db['HT']['hostname'], $connection);
+ $stmt = sqlsrv_query($conn, $sql);
+ $result_object = array();
+ if (false !== $stmt ) { // 无权限或执行错误返回false
+ // 存储过程中每个select都产生结果集
+ // 设置了SET NOCOUNT ON;就只有输出的结果集
+ $a = true;
+ while ($a !== false) {
+ $row = sqlsrv_fetch_object($stmt); // Retrieves the next row of data as a PHP object.
+ $a = !empty($row);
+ $a===true ? $result_object[] = $row : null;
+ }
+ sqlsrv_free_stmt($stmt);
+ }
+ sqlsrv_close($conn);
+ return $result_object;
+ }
+
}
/* End of file Group_model.php */
diff --git a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
index bf27da86..a232cbe4 100644
--- a/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
+++ b/webht/third_party/vendorPlanSync/models/TuLanDuo_addOrUpdateRouteOrderContentBuilder.php
@@ -128,7 +128,7 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
}
public function setRouteStandard($routeStandard)
{
- $this->orderData['routeStandard'] = $routeStandard;
+ $this->orderData['routeStandard'] = "该团按非购物团标准结算 要求/接团小技巧:\r\n" . $routeStandard;
return $this;
}
public function setDestination($destination)
@@ -146,6 +146,16 @@ class TuLanDuo_addOrUpdateRouteOrderContentBuilder extends CI_Model
$this->orderData['leavedDate'] = $leavedDate;
return $this;
}
+ public function setOperationUserName($operationUserName)
+ {
+ $this->orderData['operationUserName'] = $operationUserName;
+ return $this;
+ }
+ public function setCustomerFromCity($customerFromCity)
+ {
+ $this->orderData['customerFromCity'] = $customerFromCity;
+ return $this;
+ }
/** 团款数组 */
public function setTravelFeesType($index, $type)
diff --git a/webht/third_party/vendorPlanSync/models/orders_model.php b/webht/third_party/vendorPlanSync/models/orders_model.php
index 02412028..acfdc36f 100644
--- a/webht/third_party/vendorPlanSync/models/orders_model.php
+++ b/webht/third_party/vendorPlanSync/models/orders_model.php
@@ -15,7 +15,7 @@ class Orders_model extends CI_Model {
from MemberInfo
where MEI_SN=CUL_CUI_SN
) as MemberName,
- (select MEI_BirthDay from MemberInfo where MEI_SN=CUL_CUI_SN) as BirthDay,
+ (select CONVERT(DATE,MEI_BirthDay) from MemberInfo where MEI_SN=CUL_CUI_SN) as BirthDay,
ISNULL((select SYC2_CodeDiscribe
from V_System_Code
where LGC_LGC=2
@@ -27,9 +27,9 @@ class Orders_model extends CI_Model {
where LGC_LGC = 2
and COI_SN in (select MEI_Country from MemberInfo where MEI_SN=CUL_CUI_SN)
) as Country,
- MEI_Phone phone,
+ CASE isnull(CUL_IsLinkMan,0) WHEN 1 THEN MEI_Phone ELSE '' END AS phone,
MEI_PassportNo PassportNo,
- MEI_PassportValidDate PassportValidDate
+ CONVERT(DATE,MEI_PassportValidDate,120) PassportValidDate
-- (select MEI_PassportNo from MemberInfo where MEI_SN=CUL_CUI_SN) PassportNo,
-- (select MEI_PassportValidDate from MemberInfo where MEI_SN=CUL_CUI_SN) PassportValidDate
-- ,(select dbo.GetSysCodeName(MEI_Occupation,2) from MemberInfo where MEI_SN=CUL_CUI_SN) as Occupation
|