diff --git a/webht/third_party/vendorPlanSync/controllers/index.php b/webht/third_party/vendorPlanSync/controllers/index.php index 8ab53c4f..25fc9c5d 100644 --- a/webht/third_party/vendorPlanSync/controllers/index.php +++ b/webht/third_party/vendorPlanSync/controllers/index.php @@ -9,6 +9,7 @@ class Index extends CI_Controller { parent::__construct(); mb_regex_encoding("UTF-8"); bcscale(4); + error_reporting(0); $GLOBALS['__HAINA_VEI__'] = 30561; $this->load->helper('array'); $this->load->library('vendor'); diff --git a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php index 5885320c..08fe8ddd 100644 --- a/webht/third_party/vendorPlanSync/libraries/Tulanduo.php +++ b/webht/third_party/vendorPlanSync/libraries/Tulanduo.php @@ -7,8 +7,8 @@ class Tulanduo { protected $ci; - /** Live */ - /** + /*! Live */ + /*! 目的地 $this->userId = "1134"; $this->key = "73d180d05d425fd192e1c5b3097e75ff"; @@ -16,29 +16,29 @@ class Tulanduo $this->userId = "18"; $this->key = "d05c25e6e6c5d4898161e0aaf700d9c7"; */ - // private $send_host = array( - // "30" => array( - // "userId" => 1134 - // ,"key" => "73d180d05d425fd192e1c5b3097e75ff" - // ) - // ,"1" => array( - // "userId" => 18 - // ,"key" => "d05c25e6e6c5d4898161e0aaf700d9c7" - // ) - // ); - /** - * test - */ private $send_host = array( "30" => array( - "userId" => 6035 - ,"key" => "3bd16efd5f4165378f144da1f4829996" + "userId" => 1134 + ,"key" => "73d180d05d425fd192e1c5b3097e75ff" ) ,"1" => array( - "userId" => 512 - ,"key" => "4d9bde5ce79d6093e4a98bebbd3892c2" + "userId" => 18 + ,"key" => "d05c25e6e6c5d4898161e0aaf700d9c7" ) ); + /*! + * test + */ + // private $send_host = array( + // "30" => array( + // "userId" => 6035 + // ,"key" => "3bd16efd5f4165378f144da1f4829996" + // ) + // ,"1" => array( + // "userId" => 6035 + // ,"key" => "3bd16efd5f4165378f144da1f4829996" + // ) + // ); // userId key // 1343 2e47c3721e3ff6e816fe6b928d7acc7d @@ -46,13 +46,13 @@ class Tulanduo // 30548 9db75a2dc17156eb122364295804b7a2 // test - public $list_url = "http://ltdj.ltsoftware.net:19919/action/api/searchRouteOrder/"; - public $detail_url = "http://ltdj.ltsoftware.net:19919/action/api/detailRouteOrder/"; - public $neworder_url = "http://ltdj.ltsoftware.net:19919/action/api/addOrUpdateRouteOrder/"; + // public $list_url = "http://ltdj.ltsoftware.net:19919/action/api/searchRouteOrder/"; + // public $detail_url = "http://ltdj.ltsoftware.net:19919/action/api/detailRouteOrder/"; + // 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 $neworder_url = "http://djb3c.ltsoftware.net:9921/action/api/addOrUpdateRouteOrder/"; + 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(){ $this->ci =& get_instance(); @@ -78,10 +78,12 @@ class Tulanduo } // 商务 if (strval($order->GRI_OrderType) === "227002") { + return false; // for Trippest deploy return $this->push_tour($order); } // 传统订单 if (strval($order->GRI_OrderType) === "227001") { + return false; // for Trippest deploy return $this->push_tour($order); } @@ -94,6 +96,7 @@ class Tulanduo */ public function push_tour($vas=null) { + return false; // for Trippest deploy $userId = $this->send_host["1"]["userId"]; $userKey = $this->send_host["1"]["key"]; $gri_sn = $vas->GRI_SN; @@ -155,11 +158,11 @@ class Tulanduo // ->setTravelFeesUnit(0, 1) // ->setTravelFeesSumMoney(0, $travel_fee) // ->setTravelFeesRemark(0, ""); - // 补全空的日期,行车为空 + // 补全空的日期,行程为空 $date1 = new DateTime($first_date); $date_end = new DateTime($end_date); $date_diff = $date_end->diff($date1); - $d = ($date_diff->format("%d")); + $d = ($date_diff->format("%a")); $all_date = array(); for ($j=0; $j < ($d+1); $j++) { $all_date[] = date('Y-m-d', strtotime("+$j day", strtotime($first_date))); @@ -204,15 +207,15 @@ log_message('error',$resp); /** VendorPlanSync */ $sync_ret = array( "VPS_VAS_SN" => $vas_sn - ,"VPS_GRI_SN" => $gri_sn - ,"VPS_VEI_SN" => $vei_sn - ,"VPS_startDate" => $first_date - ,"VPS_endDate" => $end_date - ,"VPS_sendHost" => $userId - ,"VPS_externalId" => $response->responseData->orderId - ,"VPS_externalorderType" => $order_type - ,"VPS_externalorderState" => $sync_orderstate - ,"VPS_sendTime" => date('Y-m-d H:i:s') + ,"VPS_GRI_SN" => $gri_sn + ,"VPS_VEI_SN" => $vei_sn + ,"VPS_startDate" => $first_date + ,"VPS_endDate" => $end_date + ,"VPS_sendHost" => $userId + ,"VPS_externalId" => $response->responseData->orderId + ,"VPS_externalorderType" => $order_type + ,"VPS_externalorderState" => $sync_orderstate + ,"VPS_sendTime" => date('Y-m-d H:i:s') ); if ($vps_sn === 0) { $sync_id = $this->ci->Group_model->insert_VendorPlanSync($sync_ret); @@ -233,7 +236,6 @@ log_message('error',$resp); */ public function push_trippest($vas=null) { - // return "[Tulanduo>push_trippest] Done. "; // test /** 目的地 */ $userId = $this->send_host["30"]["userId"]; $userKey = $this->send_host["30"]["key"]; @@ -266,20 +268,22 @@ log_message('error',$resp); } } // 收款合并为一条 - $travel_fees = new stdClass(); - $travel_fees = $paid_to_trippest[0]; - $travel_fees->SUM_SSJE = 0; - foreach ($paid_to_trippest as $ktf => $vtf) { - $travel_fees->SUM_SSJE = bcadd($travel_fees->SUM_SSJE, $vtf->GAI_SSJE); + if ( ! empty($paid_to_trippest)) { + $travel_fees = $paid_to_trippest[0]; + $travel_fees->SUM_SSJE = 0; + foreach ($paid_to_trippest as $ktf => $vtf) { + $travel_fees->SUM_SSJE = bcadd($travel_fees->SUM_SSJE, $vtf->GAI_SSJE); + } } // 代收合并为一条 - $replace_collections = new stdClass(); - $replace_collections = $pay_to_vendor[0]; - $replace_collections->SUM_SSJE = 0; - $replace_collections->ALL_Memo = ""; - foreach ($pay_to_vendor as $ktv => $vtv) { - $replace_collections->SUM_SSJE = bcadd($replace_collections->SUM_SSJE, $vtv->GAI_SSJE); - $replace_collections->ALL_Memo .= $vtv->ALL_Memo; + if ( ! empty($pay_to_vendor)) { + $replace_collections = $pay_to_vendor[0]; + $replace_collections->SUM_SSJE = 0; + $replace_collections->ALL_Memo = ""; + foreach ($pay_to_vendor as $ktv => $vtv) { + $replace_collections->SUM_SSJE = bcadd($replace_collections->SUM_SSJE, $vtv->GAI_SSJE); + $replace_collections->ALL_Memo .= $vtv->ALL_Memo; + } } // 按产品拆分 按订单类型拆分? 单团/拼团; 未设置则按产品类型:接送 $fill_order = array(); @@ -368,11 +372,9 @@ log_message('error',$resp); ->setCustomersPeopleType($key, ($vg->BPE_GuestType==1 ? "成人" : "儿童")) ->setCustomersDocumentType($key, "护照") // Passport No. ->setCustomersDocumentNo($key, $vg->BPE_Passport) - // ->setCustomersOtherInfo($key, $this->ci->BIZ_order->GetNationalityName($vg->BPE_Nationality)) ; $this_otherinfo .= $this->ci->BIZ_order->GetNationalityName($vg->BPE_Nationality); if (trim($vf['cold'][0]->GUT_TEL) != "" && $key===0) { - // $order_remark = "预定人电话:" . trim($vf["cold"][0]->GUT_TEL); $this_otherinfo .= "; 电话:"; $this_otherinfo .= trim($vf["cold"][0]->GUT_POST)!=="" ? "+".trim($vf["cold"][0]->GUT_POST) : "" ; $this_otherinfo .= " " . trim($vf["cold"][0]->GUT_TEL); @@ -469,7 +471,7 @@ log_message('error',$resp); $date1 = new DateTime($first_date); $date_end = new DateTime($end_date); $date_diff = $date_end->diff($date1); - $d = ($date_diff->format("%d")); + $d = ($date_diff->format("%a")); $all_date = array(); for ($j=0; $j < ($d+1); $j++) { $all_date[] = date('Y-m-d', strtotime("+$j day", strtotime($first_date))); @@ -478,48 +480,49 @@ log_message('error',$resp); foreach ($all_date as $kd => $vd) { if ( ! in_array($vd, $real_date)) { $this->ci->tldOrderBuilder->setScheduleDetailsTitle($kd, "无") - ->setScheduleDetailsContent($kd, "无") - ->setScheduleDetailsAccommodation($kd, "") - // ->setScheduleDetailsTraffic($kd, ($vso->PAG_Vehicle>60001 ? 1 : 0)) - ->setScheduleDetailsBreakFirst($kd, 0 ) - ->setScheduleDetailsDinner($kd, 0) - ->setScheduleDetailsLunch($kd, 0) - ; + ->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->ci->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']) - ; + ->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) { - $this->ci->tldOrderBuilder->setTravelFeesType(0, "Per Group") - ->setTravelFeesMoney(0, $travel_fees->SUM_SSJE) - ->setTravelFeesNum(0, 1) - ->setTravelFeesUnit(0, 1) - ->setTravelFeesSumMoney(0, $travel_fees->SUM_SSJE); - $this->ci->tldOrderBuilder->setReplaceCollectionsType(0, "Per Group") - ->setReplaceCollectionsMoney(0, $replace_collections->SUM_SSJE) - ->setReplaceCollectionsRemark(0, $replace_collections->ALL_Memo); + if ( ! empty($travel_fees) ) { + $this->ci->tldOrderBuilder->setTravelFeesType(0, "Per Group") + ->setTravelFeesMoney(0, $travel_fees->SUM_SSJE) + ->setTravelFeesNum(0, 1) + ->setTravelFeesUnit(0, 1) + ->setTravelFeesSumMoney(0, $travel_fees->SUM_SSJE); + } + if ( ! empty($replace_collections) ) { + $this->ci->tldOrderBuilder->setReplaceCollectionsType(0, "Per Group") + ->setReplaceCollectionsMoney(0, $replace_collections->SUM_SSJE) + ->setReplaceCollectionsRemark(0, $replace_collections->ALL_Memo); + } } // 查询是否变更 TODO deprecated $sync_orderstate = 10; $vps_sn = 0; $vendor_orderid = 0; $this->ci->tldOrderBuilder->clearModifyLogInfo(); - // $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder); - $resp = '{"status":1,"errMsg":"","responseData":{"orderId":' . rand(1000,9999) . '}}'; // test -echo $this->ci->tldOrderBuilder->getBizContent(); -log_message('error',$resp); + $resp = $this->excute_curl($this->neworder_url, $this->ci->tldOrderBuilder); $response = json_decode($resp); if ($response->status == 1) { /** VendorPlanSync */ @@ -552,6 +555,7 @@ log_message('error',$resp); public function tourguide_update($input, $vps, $eva) { + return false; // for Trippest deploy $ret['status'] = -1; $ret['err'] = 100; $ret['errMsg'] = "未知错误"; @@ -625,6 +629,7 @@ log_message('error',$resp); */ public function order_change() { + return false; // for Trippest deploy $this->load->model('Order_update'); $ret['status'] = -1; $ret['errMsg'] = "未知错误"; @@ -689,7 +694,8 @@ log_message('error',$resp); } - private function excute_curl($url, $content_builder) { + private function excute_curl($url, $content_builder) + { $ch = curl_init(); curl_setopt($ch, CURLOPT_URL, $url); curl_setopt($ch, CURLOPT_FAILONERROR, false); diff --git a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php index ab95d028..50307ec4 100644 --- a/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php +++ b/webht/third_party/vendorPlanSync/models/BIZ_orders_model.php @@ -104,7 +104,6 @@ class BIZ_Orders_model extends CI_Model { $sql = "SELECT * from BIZ_PackageOrderInfo poi where poi.POI_COLD_SN IN ($COLD_SN_str)"; -log_message('error',$sql); return $this->HT->query($sql)->result(); } @@ -129,7 +128,6 @@ log_message('error',$sql); AND ISNULL(bgai.GAI_VEI_SN,0) in (0,$vei_sn_str) AND bgai.GAI_SQJE > 0 AND coli_ID = '$COLI_ID'"; -log_message('error',$sql); $query = $this->HT->query($sql); return $query->result(); } @@ -1847,8 +1845,6 @@ log_message('error',$sql); ,"BOL_Creator" => 29 ,"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); } diff --git a/webht/third_party/vendorPlanSync/models/Group_model.php b/webht/third_party/vendorPlanSync/models/Group_model.php index 920dd5bd..6d2e4d94 100644 --- a/webht/third_party/vendorPlanSync/models/Group_model.php +++ b/webht/third_party/vendorPlanSync/models/Group_model.php @@ -22,18 +22,18 @@ class Group_model extends CI_Model { inner join GRoupInfo gri on GRI_SN=VAS_GRI_SN where 1=1 "; $sql .= $gri_sn!==0 ? $gri_sql : " - and VAS_IsCancel=0 and VAS_Delete=0 and vas.DeleteFlag=0 - and VAS_IsSendSucceed=1 - -- and VAS_IsConfirm=0 - and EOI_GetDate between '$start_date' and '$end_date' - and VAS_VEI_SN in ($vendor_str) - and GRI_operator in (161,443,61) -- test - and GRI_OrderType=227001 -- test - and (VAS_IsReceive=0 -- or (VAS_SendTime > ISNULL(VAS_ReceiveTime,0)) - ) + AND VAS_IsCancel=0 AND VAS_Delete=0 AND vas.DeleteFlag=0 + AND VAS_IsSendSucceed=1 AND VAS_IsReceive=0 + AND EOI_GetDate between '$start_date' AND '$end_date' + AND VAS_VEI_SN in ($vendor_str) + -- Trippest, not confirm, not change -- for Trippest deploy + AND GRI_OrderType=227002 + AND VAS_IsConfirm=0 AND VAS_SendVary=0 + AND EXISTS ( + 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"; -log_message('error',$sql); return $this->HT->query($sql)->result(); } @@ -129,9 +129,6 @@ log_message('error',$sql); $vendor_sql $day_no_sql order by ACI_DayNo,ACI_SNInOneDay "; - -log_message('error',$this->HT->compile_binds($sql, $param_arr)); - return $this->HT->query($sql, $param_arr)->result(); } @@ -236,8 +233,6 @@ log_message('error',$this->HT->compile_binds($sql, $param_arr)); public function set_plan_received($vas_sn=0) { $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)); } @@ -266,8 +261,6 @@ log_message('error',$sql); public function insert_VendorPlanSync($sync_arr=array()) { $ss = $this->HT->insert_string('VendorPlanSendout', $sync_arr); // testing -log_message('error',$ss); - return $ss; $this->HT->insert('VendorPlanSendout', $sync_arr); return $this->HT->query("SELECT MAX(VPS_SN) VPS_SN from VendorPlanSendout") ->row()->VPS_SN; @@ -277,8 +270,6 @@ log_message('error',$ss); { $where = " VPS_SN=" . $vps; $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); }