Haina
/
information-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

push tour 增加客人手机号

Browse Source
hotfix/远程访问多媒体中心
lyt 7 years ago
parent 35694a51af
commit c8aac323fc
4 changed files with 66 additions and 47 deletions
Show Stats Download Patch File Download Diff File

83
webht/third_party/vendorPlanSync/libraries/Tulanduo.php vendored
Unescape Escape View File

@ -27,7 +27,7 @@ class Tulanduo
// ) // )
// ); // );
/*! /*!
* test * test:
*/ */
private $send_host = array( private $send_host = array(
"30" => array( "30" => array(
@ -45,7 +45,7 @@ class Tulanduo
// 29188 95c3b0d958a79a1216e651df182b3cb4 // 29188 95c3b0d958a79a1216e651df182b3cb4
// 30548 9db75a2dc17156eb122364295804b7a2 // 30548 9db75a2dc17156eb122364295804b7a2
// test // test:
public $list_url = "http://ltdj.ltsoftware.net:19919/action/api/searchRouteOrder/"; public $list_url = "http://ltdj.ltsoftware.net:19919/action/api/searchRouteOrder/";
public $detail_url = "http://ltdj.ltsoftware.net:19919/action/api/detailRouteOrder/"; public $detail_url = "http://ltdj.ltsoftware.net:19919/action/api/detailRouteOrder/";
public $neworder_url = "http://ltdj.ltsoftware.net:19919/action/api/addOrUpdateRouteOrder/"; public $neworder_url = "http://ltdj.ltsoftware.net:19919/action/api/addOrUpdateRouteOrder/";
@ -112,8 +112,9 @@ class Tulanduo
} }
$all_day_no = array_map(function($ele){return $ele->GRD_DayNo;}, $grd_info); $all_day_no = array_map(function($ele){return $ele->GRD_DayNo;}, $grd_info);
$arrange_info = $this->ci->Group_model->get_arrange_info($gri_sn, $vei_sn); $arrange_info = $this->ci->Group_model->get_arrange_info($gri_sn, $vei_sn);
$routeName = "中华游" . $arrange_info[0]->tocity . "线路"; // TODO 线路名称 $routeName = "中华游" . $arrange_info[0]->tocity . "常规线路"; // TODO: 线路名称
$routeType = "桂林海纳国旅"; // TODO 线路类型 // $routeType = "桂林海纳国旅"; // TODO: 线路类型
$routeType = $routeName;
$agcOrderNo = $vas->GRI_Name . "-" . $arrange_info[0]->citycode; $agcOrderNo = $vas->GRI_Name . "-" . $arrange_info[0]->citycode;
$agcOrderNo .= "(" . $vas->operator . ")"; $agcOrderNo .= "(" . $vas->operator . ")";
$first_date = $grd_info[0]->day_no_raw; $first_date = $grd_info[0]->day_no_raw;
@ -122,39 +123,39 @@ class Tulanduo
$request_info = $this->ci->Group_model->get_plan_request($gri_sn); $request_info = $this->ci->Group_model->get_plan_request($gri_sn);
$order_type = 1; $order_type = 1;
$this->ci->tldOrderBuilder->setUserId($userId) $this->ci->tldOrderBuilder->setUserId($userId)
->setKey($userKey) ->setKey($userKey)
->setOrderType($order_type) ->setOrderType($order_type)
->setRouteName($routeName) ->setRouteName($routeName)
->setRouteType($routeType) ->setRouteType($routeType)
->setAgcOrderNo($agcOrderNo) ->setAgcOrderNo($agcOrderNo)
->setAdultNum(intval($arrange_info[0]->ACI_PersonNum)) ->setAdultNum(intval($arrange_info[0]->ACI_PersonNum))
->setChildNum(intval(bcadd($arrange_info[0]->ACI_ChildNum, $arrange_info[0]->ACI_BabyNum))) ->setChildNum(intval(bcadd($arrange_info[0]->ACI_ChildNum, $arrange_info[0]->ACI_BabyNum)))
->setDestination($arrange_info[0]->tocity) ->setDestination($arrange_info[0]->tocity)
->setTravelDate($first_date) ->setTravelDate($first_date)
->setLeavedDate($end_date) ->setLeavedDate($end_date)
// ->setOrderRemark($order_remark) // 订单备注 TODO // ->setOrderRemark($order_remark) // 订单备注 TODO:
->setRoomStandard($request_info->GCI_HotelRequest) // 住房标准 ->setRoomStandard($request_info->GCI_HotelRequest) // 住房标准
->setRouteStandard($request_info->GCI_Request) // 行程服务标准 ->setRouteStandard($request_info->GCI_Request) // 行程服务标准
; ;
$guestlist = $this->ci->orders_model->get_customer_list($gri_sn); $guestlist = $this->ci->orders_model->get_customer_list($gri_sn);
foreach ($guestlist as $key => $vg) { foreach ($guestlist as $key => $vg) {
$this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName ) $this->ci->tldOrderBuilder->setCustomersName($key, $vg->MemberName )
->setCustomersPeopleType($key, (calc_age_type($vg->BirthDay)==1 ? "成人" : "儿童")) ->setCustomersPeopleType($key, (calc_age_type($vg->BirthDay)==1 ? "成人" : "儿童"))
->setCustomersDocumentType($key, "护照") // Passport No. ->setCustomersDocumentType($key, "护照") // Passport No.
->setCustomersDocumentNo($key, $vg->PassportNo) ->setCustomersDocumentNo($key, $vg->PassportNo)
->setCustomersOtherInfo($key, $vg->Country); ->setCustomersOtherInfo($key, $vg->Country . "; " . $vg->phone);
} }
// $travel_fee = 0; $travel_fee = 0;
// foreach ($arrange_info as $kaci => $vaci) { foreach ($arrange_info as $kaci => $vaci) {
// $travel_fee = bcadd($travel_fee, $vaci->ACI_Amount); $travel_fee = bcadd($travel_fee, $vaci->ACI_Amount);
// } }
// // TODO 是否需要travelFee // TODO: 是否需要travelFee
// $this->ci->tldOrderBuilder->setTravelFeesType(0, "Per Group") $this->ci->tldOrderBuilder->setTravelFeesType(0, "Per Group")
// ->setTravelFeesMoney(0, $travel_fee) ->setTravelFeesMoney(0, $travel_fee)
// ->setTravelFeesNum(0, 1) ->setTravelFeesNum(0, 1)
// ->setTravelFeesUnit(0, 1) ->setTravelFeesUnit(0, 1)
// ->setTravelFeesSumMoney(0, $travel_fee) ->setTravelFeesSumMoney(0, $travel_fee)
// ->setTravelFeesRemark(0, ""); ->setTravelFeesRemark(0, "");
// 补全空的日期,行程为空 // 补全空的日期,行程为空
$date1 = new DateTime($first_date); $date1 = new DateTime($first_date);
$date_end = new DateTime($end_date); $date_end = new DateTime($end_date);
@ -180,7 +181,7 @@ class Tulanduo
foreach ($grd_info as $kgrd => $vgrd) { foreach ($grd_info as $kgrd => $vgrd) {
if ($vd==$vgrd->day_no_raw) { if ($vd==$vgrd->day_no_raw) {
$this->ci->tldOrderBuilder->setScheduleDetailsTitle($kd, $vgrd->GRD_OrderDate) $this->ci->tldOrderBuilder->setScheduleDetailsTitle($kd, $vgrd->GRD_OrderDate)
->setScheduleDetailsContent($kd, $vgrd->GRD_Landscape) ->setScheduleDetailsContent($kd, $vgrd->GRD_Landscape . "\r\n" . $vgrd->GRD_Traffic)
->setScheduleDetailsAccommodation($kd, $vgrd->GRD_Hotel) ->setScheduleDetailsAccommodation($kd, $vgrd->GRD_Hotel)
->setScheduleDetailsTraffic($kd, ($vgrd->GRD_Traffic)) ->setScheduleDetailsTraffic($kd, ($vgrd->GRD_Traffic))
->setScheduleDetailsBreakFirst($kd, 0 ) ->setScheduleDetailsBreakFirst($kd, 0 )
@ -190,13 +191,13 @@ class Tulanduo
} }
} }
} }
// 查询是否变更 TODO deprecated // 查询是否变更 TODO: deprecated at 2019-05
$sync_orderstate = 10; $sync_orderstate = 10;
$vps_sn = 0; $vps_sn = 0;
$vendor_orderid = 0; $vendor_orderid = 0;
$this->ci->tldOrderBuilder->clearModifyLogInfo(); $this->ci->tldOrderBuilder->clearModifyLogInfo();
// $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder); // $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder);
$resp = '{"status":1,"errMsg":"","responseData":{"orderId":' . rand(1000,9999) . '}}'; // test $resp = '{"status":1,"errMsg":"","responseData":{"orderId":' . rand(1000,9999) . '}}'; // test:
echo $this->ci->tldOrderBuilder->getBizContent(); echo $this->ci->tldOrderBuilder->getBizContent();
log_message('error',$resp); log_message('error',$resp);
$response = json_decode($resp); $response = json_decode($resp);
@ -222,7 +223,6 @@ log_message('error',$resp);
/** VendorArrangeState VAS_IsReceive */ /** VendorArrangeState VAS_IsReceive */
$this->ci->Group_model->set_plan_received($vas_sn); $this->ci->Group_model->set_plan_received($vas_sn);
} }
// return $this->ci->tldOrderBuilder->getBizContent() . "[Tulanduo>push_tour] Done. ";
return "[Tulanduo>push_tour] Done. "; return "[Tulanduo>push_tour] Done. ";
} }
@ -233,6 +233,7 @@ log_message('error',$resp);
*/ */
public function push_trippest($vas=null) public function push_trippest($vas=null)
{ {
return false; // test: push_tour
/** 目的地 */ /** 目的地 */
$userId = $this->send_host["30"]["userId"]; $userId = $this->send_host["30"]["userId"];
$userKey = $this->send_host["30"]["key"]; $userKey = $this->send_host["30"]["key"];
@ -358,7 +359,7 @@ log_message('error',$resp);
->setTravelDate(strstr($vf["cold"][0]->COLD_StartDate, " ", true)) ->setTravelDate(strstr($vf["cold"][0]->COLD_StartDate, " ", true))
->setLeavedDate($end_date) ->setLeavedDate($end_date)
->setOrderRemark($order_remark) ->setOrderRemark($order_remark)
// todo 抵离交通 // todo: 抵离交通
// ->setToTraffic($toTraffic) // ->setToTraffic($toTraffic)
// ->setBackTraffic($backTraffic) // ->setBackTraffic($backTraffic)
; ;
@ -514,7 +515,7 @@ log_message('error',$resp);
->setReplaceCollectionsRemark(0, $replace_collections->ALL_Memo); ->setReplaceCollectionsRemark(0, $replace_collections->ALL_Memo);
} }
} }
// 查询是否变更 TODO deprecated // 查询是否变更 TODO: deprecated
$sync_orderstate = 10; $sync_orderstate = 10;
$vps_sn = 0; $vps_sn = 0;
$vendor_orderid = 0; $vendor_orderid = 0;
@ -567,7 +568,7 @@ log_message('error',$resp);
->setUserId($userId) ->setUserId($userId)
->setKey($userKey); ->setKey($userKey);
$detail_resp = $this->excute_curl($this->detail_url, $this->tld_order); $detail_resp = $this->excute_curl($this->detail_url, $this->tld_order);
// $detail_resp = '{"status":1,"errMsg":"","orderDetail":{"orderId":' . rand(1000,9999) . ',"operationDetails": {"guiderOperations":[{"name":"北京翟梦琪Susie","mobelPhone":"18801326155","startDate":"2017-04-25","endDate":"2017-04-25","sumMoney":400,"remark":"","guiderPhoto":"http://djb3c.ltsoftware.net:9921/projects/djb3c//uploadImages/guider/1526898234415.png"}]}}}'; // test // $detail_resp = '{"status":1,"errMsg":"","orderDetail":{"orderId":' . rand(1000,9999) . ',"operationDetails": {"guiderOperations":[{"name":"北京翟梦琪Susie","mobelPhone":"18801326155","startDate":"2017-04-25","endDate":"2017-04-25","sumMoney":400,"remark":"","guiderPhoto":"http://djb3c.ltsoftware.net:9921/projects/djb3c//uploadImages/guider/1526898234415.png"}]}}}'; // test:
$detail_jsonResp = json_decode($detail_resp); $detail_jsonResp = json_decode($detail_resp);
// 判断 // 判断
if ($detail_jsonResp->status !== 1) { if ($detail_jsonResp->status !== 1) {
@ -635,7 +636,7 @@ log_message('error',$resp);
$ret['errMsg'] = "身份验证失败."; $ret['errMsg'] = "身份验证失败.";
return $this->output->set_content_type('application/json')->set_output(json_encode($ret)); return $this->output->set_content_type('application/json')->set_output(json_encode($ret));
} }
// $vendorID = 29188;//29188 1343; // test // $vendorID = 29188;//29188 1343; // test:
$vas_info = array(); $vas_info = array();
if (in_array($input['agcName'], array("D目的地桂林组", "Trippest"))) { if (in_array($input['agcName'], array("D目的地桂林组", "Trippest"))) {
$vas_info = $this->BIZ_order->get_vendorarrangestate_byVendor($input['orderId'], $vendorID); $vas_info = $this->BIZ_order->get_vendorarrangestate_byVendor($input['orderId'], $vendorID);

4
webht/third_party/vendorPlanSync/models/BIZ_orders_model.php vendored
Unescape Escape View File

@ -104,6 +104,7 @@ class BIZ_Orders_model extends CI_Model {
$sql = "SELECT * $sql = "SELECT *
from BIZ_PackageOrderInfo poi from BIZ_PackageOrderInfo poi
where poi.POI_COLD_SN IN ($COLD_SN_str)"; where poi.POI_COLD_SN IN ($COLD_SN_str)";
log_message('error',$sql);
return $this->HT->query($sql)->result(); return $this->HT->query($sql)->result();
} }
@ -128,6 +129,7 @@ class BIZ_Orders_model extends CI_Model {
AND ISNULL(bgai.GAI_VEI_SN,0) in (0,$vei_sn_str) AND ISNULL(bgai.GAI_VEI_SN,0) in (0,$vei_sn_str)
AND bgai.GAI_SQJE > 0 AND bgai.GAI_SQJE > 0
AND coli_ID = '$COLI_ID'"; AND coli_ID = '$COLI_ID'";
log_message('error',$sql);
$query = $this->HT->query($sql); $query = $this->HT->query($sql);
return $query->result(); return $query->result();
} }
@ -1845,6 +1847,8 @@ class BIZ_Orders_model extends CI_Model {
,"BOL_Creator" => 29 ,"BOL_Creator" => 29
,"BOL_CreateTime" => date('Y-m-d H:i:s') ,"BOL_CreateTime" => date('Y-m-d H:i:s')
); );
return log_message('error',$this->HT->insert_string("BIZ_OrderOperationLog", $db_column));
return ;
return $this->HT->insert("BIZ_OrderOperationLog", $db_column); return $this->HT->insert("BIZ_OrderOperationLog", $db_column);
} }

18
webht/third_party/vendorPlanSync/models/Group_model.php vendored
Unescape Escape View File

@ -27,13 +27,14 @@ class Group_model extends CI_Model {
AND EOI_GetDate between '$start_date' AND '$end_date' AND EOI_GetDate between '$start_date' AND '$end_date'
AND VAS_VEI_SN in ($vendor_str) AND VAS_VEI_SN in ($vendor_str)
-- Trippest, not confirm, not change -- for Trippest deploy -- Trippest, not confirm, not change -- for Trippest deploy
AND GRI_OrderType=227002 -- AND GRI_OrderType=227002
AND VAS_IsConfirm=0 AND VAS_SendVary=0 AND VAS_IsConfirm=0 AND VAS_SendVary=0
AND EXISTS ( -- AND EXISTS (
select 1 from OperatorInfo where OPI_SN=GRI_operator AND OPI_DEI_SN=30 -- select 1 from OperatorInfo where OPI_SN=GRI_operator AND OPI_DEI_SN=30
) -- )
"; ";
$sql .= " order by EOI_GetDate asc,vas.VAS_SendTime asc, vas.VAS_IsConfirm asc"; $sql .= " order by EOI_GetDate asc,vas.VAS_SendTime asc, vas.VAS_IsConfirm asc";
log_message('error',$sql);
return $this->HT->query($sql)->result(); return $this->HT->query($sql)->result();
} }
@ -129,6 +130,9 @@ class Group_model extends CI_Model {
$vendor_sql $vendor_sql
$day_no_sql $day_no_sql
order by ACI_DayNo,ACI_SNInOneDay "; order by ACI_DayNo,ACI_SNInOneDay ";
log_message('error',$this->HT->compile_binds($sql, $param_arr));
return $this->HT->query($sql, $param_arr)->result(); return $this->HT->query($sql, $param_arr)->result();
} }
@ -233,6 +237,8 @@ class Group_model extends CI_Model {
public function set_plan_received($vas_sn=0) public function set_plan_received($vas_sn=0)
{ {
$sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=? "; $sql = "UPDATE VendorArrangeState set VAS_IsReceive=1,VAS_ReceiveTime=GETDATE() where VAS_SN=? ";
log_message('error',$sql);
return $sql; // testing
return $this->HT->query($sql, array($vas_sn)); return $this->HT->query($sql, array($vas_sn));
} }
@ -261,6 +267,8 @@ class Group_model extends CI_Model {
public function insert_VendorPlanSync($sync_arr=array()) public function insert_VendorPlanSync($sync_arr=array())
{ {
$ss = $this->HT->insert_string('VendorPlanSendout', $sync_arr); // testing $ss = $this->HT->insert_string('VendorPlanSendout', $sync_arr); // testing
log_message('error',$ss);
return $ss;
$this->HT->insert('VendorPlanSendout', $sync_arr); $this->HT->insert('VendorPlanSendout', $sync_arr);
return $this->HT->query("SELECT MAX(VPS_SN) VPS_SN from VendorPlanSendout") return $this->HT->query("SELECT MAX(VPS_SN) VPS_SN from VendorPlanSendout")
->row()->VPS_SN; ->row()->VPS_SN;
@ -270,6 +278,8 @@ class Group_model extends CI_Model {
{ {
$where = " VPS_SN=" . $vps; $where = " VPS_SN=" . $vps;
$update_sql = $this->HT->update_string('VendorPlanSendout', $sync_arr, $where); $update_sql = $this->HT->update_string('VendorPlanSendout', $sync_arr, $where);
log_message('error',$update_sql);
return $update_sql; // testing
return $this->HT->query($update_sql); return $this->HT->query($update_sql);
} }

8
webht/third_party/vendorPlanSync/models/orders_model.php vendored
Unescape Escape View File

@ -27,10 +27,14 @@ class Orders_model extends CI_Model {
where LGC_LGC = 2 where LGC_LGC = 2
and COI_SN in (select MEI_Country from MemberInfo where MEI_SN=CUL_CUI_SN) and COI_SN in (select MEI_Country from MemberInfo where MEI_SN=CUL_CUI_SN)
) as Country, ) as Country,
(select MEI_PassportNo from MemberInfo where MEI_SN=CUL_CUI_SN) PassportNo, MEI_Phone phone,
(select MEI_PassportValidDate from MemberInfo where MEI_SN=CUL_CUI_SN) PassportValidDate MEI_PassportNo PassportNo,
MEI_PassportValidDate 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 -- ,(select dbo.GetSysCodeName(MEI_Occupation,2) from MemberInfo where MEI_SN=CUL_CUI_SN) as Occupation
from CustomerList from CustomerList
inner join MemberInfo on MEI_SN=CUL_CUI_SN
where isnull(CUL_IsAgent,0)=0 where isnull(CUL_IsAgent,0)=0
and isnull(CUL_IsEmergency,0)=0 and isnull(CUL_IsEmergency,0)=0
and isnull(CUL_IsTJR,0)=0 and isnull(CUL_IsTJR,0)=0

Write Preview
Loading…
Cancel
Save