diff --git a/application/controllers/information.php b/application/controllers/information.php index 432d599b..1b56f46a 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -653,6 +653,18 @@ class Information extends CI_Controller } } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest_content = $this->load->view( + $template_path . '-feedback-newest', + array('feedback_list' => $feedback_newest), + true + ); + $information->ic_content = str_replace( + '', + $feedback_newest_content, + $information->ic_content + ); + // 天气预报模板 $weather_forecast_content = $this->load->view( $template_path . '-weather-forecast', @@ -968,6 +980,18 @@ class Information extends CI_Controller file_put_contents($html_path, $template, LOCK_EX); } + public function test_feedback() + { + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + var_dump($feedback_newest); + + $feedback_newest_content = $this->load->view( + 'ch-feedback-newest', + array('feedback_list' => $feedback_newest), + true); + var_dump($feedback_newest_content); + } + public function make_www_cache_gh($device, $information, $recommand_information) { $data = array(); @@ -1129,6 +1153,18 @@ class Information extends CI_Controller $information->ic_content = str_replace('', $tour_form_content, $information->ic_content); } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest_content = $this->load->view( + $template_path . '-feedback-newest', + array('feedback_list' => $feedback_newest), + true + ); + $information->ic_content = str_replace( + '', + $feedback_newest_content, + $information->ic_content + ); + if (is_file('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.globalhighlights.com/css/gh-global.css')); } else { @@ -1396,6 +1432,18 @@ class Information extends CI_Controller } } + $feedback_newest = $this->Feedback_model->get_feedback_newest(); + $feedback_newest_content = $this->load->view( + $template_path . '-feedback-newest', + array('feedback_list' => $feedback_newest), + true + ); + $information->ic_content = str_replace( + '', + $feedback_newest_content, + $information->ic_content + ); + //主样式表，内联模式 if (is_file('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')) { //主样式表，内联模式，优先读取本地，没有在从网络读取，为了加速 $main_css_string = compress_css(file_get_contents('D:/wwwroot/origin-www.asiahighlights.com/css/mobile-first.css')); diff --git a/application/models/feedback_model.php b/application/models/feedback_model.php index a488d08a..4e55f931 100644 --- a/application/models/feedback_model.php +++ b/application/models/feedback_model.php @@ -7,6 +7,40 @@ class Feedback_model extends CI_Model { $this->HT = $this->load->database('HT', TRUE); } + /** + * 返回最新八条反馈信息 + */ + function get_feedback_newest() { + + $feedback_query = + $this->HT->query(" + select top 8 + tad_content, tai_customerid, tai_title, tai_getdate, tai_url + from Eva_TAInfo + left join Eva_TADetail on TAD_TAI_SN=TAI_SN + where TAD_Content is not null + order by tai_getdate desc"); + + $feedback_result = $feedback_query->result(); + $feedback_list = []; + + foreach ($feedback_result as $feedback_row) { + $createdOn = new DateTime($feedback_row->tai_getdate); + $createdOnString = $createdOn->format('M Y'); + + $feedback = [ + 'title' => $feedback_row->tai_title, + 'customer' => $feedback_row->tai_customerid, + 'content' => $feedback_row->tad_content, + 'url' => $feedback_row->tai_url, + 'createdOn' => $createdOnString + ]; + $feedback_list[] = $feedback; + } + + return $feedback_list; + } + /** * 根据城市英文名查找最新八条反馈信息 */ diff --git a/application/third_party/trainsystem/config/config.php b/application/third_party/trainsystem/config/config.php index 0e60a2c6..ede26a93 100644 --- a/application/third_party/trainsystem/config/config.php +++ b/application/third_party/trainsystem/config/config.php @@ -73,7 +73,9 @@ $config["train_order_status_msg"]=array( "7"=>"(改签)退票成功", "8"=>"乘客退票失败", "e"=>"数据错误，提交失败", - "9"=>"改签成功" + "9"=>"改签成功", + "c"=>"订单取消", + "r"=>"订单退款" ); //座次配对 @@ -89,7 +91,8 @@ $config["train_zw"]=array( "1"=>"硬座", "F"=>"动卧", "YDW"=>"一等卧", - "EDW"=>"二等卧" + "EDW"=>"二等卧", + "WZ" =>"无座" ); //数据库座次配对,包厢硬卧(5),无座(WZ),聚合没有 $config["db_train_zw"]=array( @@ -107,6 +110,7 @@ $config["db_train_zw"]=array( "3"=>"3", "2"=>"2", "1"=>"1", + "13"=>"WZ", "YDW"=>"YDW", "EDW"=>"EDW" ); @@ -136,6 +140,20 @@ $config["train_certificateType"]=array( "28"=>"外国人永久居留身份证2", "32"=>"港澳台居民居住证" ); + +/*退款类型 +1差额退款：原票出票及改签出票产生的儿童、卧铺差额、抢票差额退款。 +推送时间接近与其对应的出票通知、改签通知同步推送 +2核销退款：退票退款，改签后的原票退款， 推送时间见下面说明 +3异常退款：人工操作的异常订单退款 ，人工审核后推送 +5无票退款：出票失败、改签失败产生的退款，和购票失败通知几乎同步推送 +*/ +$config["train_refundType"]=array( + "1"=>"差额退款", + "2"=>"核销退款", + "3"=>"异常退款", + "5"=>"无票退款" +); //黑名单用户 diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index e6893862..47854de2 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -585,12 +585,8 @@ class addorders extends CI_Controller{ //生成接口请求头参数 $TimeStamp = date("Y-m-d H:i:s"); $serviceName = "train.addTrainOrder"; //每个接口都有自己名称 - // $companyId = "4003171843"; - // $key = "hajkrtbc"; - - /** 测试服务器 */ - $companyId = "1503141150"; - $key = "hajkrtba"; + $companyId = COMPANYID; + $key = CTRIPKEY; $strSign = $TimeStamp.$serviceName.$companyId.$key; //加密前的令牌 $Sign = md5($strSign); @@ -679,9 +675,9 @@ class addorders extends CI_Controller{ $passagersdata[$i]->certificateType = $PassportTypeseId; $passagersdata[$i]->certificateNo = des_encrypt($PassagerInfo->BPE_Passport,$key);; $passagersdata[$i]->certificateName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName); - $passagersdata[$i]->birthday =$PassagerInfo->BPE_BirthDate; + $passagersdata[$i]->birthday =date('Y-m-d',strtotime($PassagerInfo->BPE_BirthDate)); $passagersdata[$i]->realName = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName); - $passagersdata[$i]->identityLimitDate = $PassagerInfo->BPE_PassExpdate;; + $passagersdata[$i]->identityLimitDate = date('Y-m-d',strtotime($PassagerInfo->BPE_PassExpdate)); $passagersdata[$i]->countryCode = ""; $passagersdata[$i]->contactMobile = ""; $passagersdata[$i]->contactEmail = ""; @@ -731,7 +727,8 @@ class addorders extends CI_Controller{ $ResponseJson = GetPost_http($url,json_encode($PostData,JSON_UNESCAPED_UNICODE),'json'); $ResponseData = json_decode($ResponseJson); - + // print_r(json_encode($PostData)); + // die(); //预定请求成功后执行支付 if($ResponseData->returnCode == 1){ diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index e6b51db2..8871b39c 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/application/third_party/trainsystem/controllers/callback.php @@ -8,6 +8,8 @@ class callback extends CI_Controller{ $this->load->helper('train'); $this->load->model("train_system_model"); $this->load->model("BIZ_train_model"); + $this->train_certificateType = $this->config->item('train_certificateType'); + $this->train_refundType = $this->config->item('train_refundType'); } public function juhecallback(){ @@ -178,7 +180,7 @@ class callback extends CI_Controller{ if(!empty($ctrip_backdata)){ //判断回调信息是否正确，主要判断是否是本企业的回调信息 - $TimeStamp = $ctrip_backdata->timeStamp; + $TimeStamp = $ctrip_backdata->authentication->timeStamp; $serviceName = $ctrip_backdata->authentication->serviceName; //每个接口都有自己名称 $companyId = COMPANYID; $key = CTRIPKEY; @@ -247,15 +249,17 @@ class callback extends CI_Controller{ } $update_data->orderType = $ctrip_backdata->ticketResult->orderMasterInfo->orderType; //订单类型 0电子票 1配送票 2人工客票 3抢票订单 $update_data->contactName = $ctrip_backdata->ticketResult->orderMasterInfo->contactName; //联系人 - $update_data->mobileNo = $ctrip_backdata->ticketResult->orderMasterInfo->mobileNo; //联系电话 (DES加密） + $update_data->mobileNo = des_decrypt($ctrip_backdata->ticketResult->orderMasterInfo->mobileNo,$key); //联系电话 (DES加密） //人员及车票 $data_passager = new stdClass(); foreach ( $ctrip_backdata->ticketResult->passengerInfoList as $pItems) { + $data_passager->ordernumber = $ctrip_backdata->ticketResult->companyOrderId; //人员列表 $data_passager->status = '4'; - $data_passager->identitytype = $pItems->certificateType; + $certificateType = $this->train_certificateType[ $pItems->certificateType]; //证件类型，身份证传1、护照2、回乡证7、台胞证8、外国人永久居留身份证28、港澳台居民居住证32； + $data_passager->identitytype = $certificateType; $data_passager->realname = $pItems->certificateName; $data_passager->numberid = des_decrypt($pItems->certificateNo,$key) ; //证件号码 (DES加密） $data_passager->birthday = $pItems->birthday; @@ -290,7 +294,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $tItems->realTicketPrice; $SeatNo = ""; if (isset($tItems->carriageNo)){ - $SeatNo.=$tItems->carriageNo; + $SeatNo.=$tItems->carriageNo."车厢"; } if (isset($tItems->seatNo)){ $SeatNo.=$tItems->seatNo; @@ -313,6 +317,7 @@ class callback extends CI_Controller{ //添加支付记录 $add_train_payment_data = new stdClass(); $add_train_payment_data->TOC_Memo = $update_data->ordernumber.'出票费'; + $add_train_payment_data->TOC_VEI_SN = "28209"; //根据订单号获取cold_sn $order_info = $this->train_system_model->get_order_info($update_data->ordernumber); @@ -321,18 +326,47 @@ class callback extends CI_Controller{ $add_train_payment_data->TOC_TrainNumber = $update_data->trainNo; $add_train_payment_data->TOC_DepartureDate = date('Y-m-d',strtotime($update_data->departTime )); $add_train_payment_data->TOC_TicketCost = $update_data->OrderTotleFee; - $add_train_payment_data->poundage = ""; - $add_train_payment_data->FOI_TrainNetOrderNo = $update_data->ElectronicOrderNumber; + $add_train_payment_data->poundage = "0"; + $add_train_payment_data->FOI_TrainNetOrderNo = $update_data->ElectronicOrderNumber; //电子票号 //print_r($add_train_order_data);die(); $this->BIZ_train_model->add_train_payment($add_train_payment_data); //记录供应商(瀚特) $this->BIZ_train_model->update_cold_planvei_sn($cold_sn,'28209'); }else if($update_data->ServiceName == 'notice.ordercancel'){ //订单取消 $update_data->ordernumber = $ctrip_backdata->cancelResult->companyOrderId; - $update_data->OrderStatus = '1'; - $update_data->ErrorMsg = $ctrip_backdata->cancelResult->cancelTime; + $update_data->OrderStatus = 'c'; + $update_data->ErrorMsg = '订单取消'.$ctrip_backdata->cancelResult->cancelTime; $update_data->confirmcallback = $back_json; - }else if($update_data->ServiceName == 'notice.refundresult'){ //退票 + }else if($update_data->ServiceName == 'notice.refundresult'){ //退款通知 + $update_data->ordernumber = $ctrip_backdata->refundResult->companyOrderId; + $update_data->OrderStatus = 'r'; + $update_data->ErrorMsg = '退款:'.$ctrip_backdata->refundResult->refundTime; + $update_data->confirmcallback = $back_json; + + //翰特添加退款记录 + $refund_train_payment = new stdClass(); + $return_order = $ctrip_backdata->refundResult->companyOrderId; + $return_money = $ctrip_backdata->refundResult->refundAmount; //退款金额 + $refund_train_payment->TOC_VEI_SN = "28209"; + + //根据订单号获取cold_sn + $order_info = $this->train_system_model->get_order_info($return_order); + $cold_sn = $order_info->ts_cold_sn; + //print_r($order_info); + $refundType = $ctrip_backdata->refundResult->refundType; //退款类型int + $reason = $ctrip_backdata->refundResult->reason; //退款原因 + $refundTime = $ctrip_backdata->refundResult->refundTime; //退款时间 + + $memo = $return_order.'_'.$this->train_refundType[$refundType].'_原因:'. $reason . '_' . $refundTime; //退款集合信息 + $refund_train_payment->TOC_Memo = $memo; + $refund_train_payment->TOC_COLD_SN = $cold_sn; + $refund_train_payment->TOC_TrainNumber = $order_info->ts_checi; + $refund_train_payment->TOC_DepartureDate = $order_info->ts_startdate; + $refund_train_payment->TOC_TicketCost = -$return_money; + //print_r($add_train_payment_data);die(); + $this->BIZ_train_model->refund_train_payment($refund_train_payment); + + }else if($update_data->ServiceName == 'notice.returnresult'){ //退票 $update_data->ordernumber = $ctrip_backdata->refundResult->companyOrderId; $update_data->OrderStatus = '7'; $update_data->ErrorMsg = $ctrip_backdata->refundResult->reason; diff --git a/application/third_party/trainsystem/controllers/innerTrainSearch.php b/application/third_party/trainsystem/controllers/innerTrainSearch.php index 31669b11..765855ad 100644 --- a/application/third_party/trainsystem/controllers/innerTrainSearch.php +++ b/application/third_party/trainsystem/controllers/innerTrainSearch.php @@ -331,7 +331,7 @@ class innerTrainSearch extends CI_Controller{ $rwNum = $Seats->ticketLeft; } - if($Seats->seatName == '一等双软上'){ + if($Seats->seatName == '一等双软上' || $Seats->seatName=='一等卧'){ $SeaType .= '"YDW":"¥'.$Seats->maxPrice.'",'; $ydwNum = $Seats->ticketLeft; } @@ -380,7 +380,7 @@ class innerTrainSearch extends CI_Controller{ $ywNum = $Seats->ticketLeft; } - if($Seats->seatName == '二等双软上'){ + if($Seats->seatName == '二等双软上' || $Seats->seatName == '二等卧'){ $SeaType .= '"EDW":"¥'.$Seats->maxPrice.'",'; $erwNum = $Seats->ticketLeft; } @@ -572,12 +572,12 @@ class innerTrainSearch extends CI_Controller{ $TimeStamp = date("Y-m-d H:i:s"); //$TimeStamp = time(); $serviceName = "train.getAllStations"; - // $companyId = "4003171843"; - // $key = "hajkrtbc"; + $companyId = COMPANYID; + $key = CTRIPKEY; - /** 测试服务器 */ - $companyId = "1503141150"; - $key = "hajkrtbcc"; + // /** 测试服务器 */ + // $companyId = "1503141150"; + // $key = "hajkrtbcc"; $strSign = $TimeStamp.$serviceName.$companyId.$key; diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index 32c7f3a7..a5276531 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -15,9 +15,9 @@ class pages extends CI_Controller{ //首页 public function index($coli_id = null){ - // if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ - // redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - // } + if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); + } if($coli_id == null){ $cols_id = $this->input->post("ht_order"); @@ -35,7 +35,7 @@ class pages extends CI_Controller{ $list->info[$i] = new StdClass; $list->info[$i]->people = $this->BIZ_train_model->biz_people($v->COLD_SN); $list->info[$i]->train = $this->BIZ_train_model->biz_order_detail($v->COLD_SN); - $list->info[$i]->status = $this->BIZ_train_model->get_biz_jol($v->COLD_SN); + $list->info[$i]->status = $this->train_system_model->get_submitStatus($v->COLD_SN); //判断是否提交过 $i++; } $list->cols_id=$cols_id; @@ -57,9 +57,9 @@ class pages extends CI_Controller{ //系统列表页面 public function order_list(){ - // if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ - // redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); - // } + if(get_cookie('dingname') == '' && get_cookie('dingunionid') == ''){ + redirect('/apps/dinglogin/login/?returnurl=/apps/trainsystem/pages/'); + } $page_size = 10; $page = $this->input->get("page"); diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index 0294a8d6..321e6e49 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -158,52 +158,92 @@ class BIZ_train_model extends CI_Model { //删除多余支付记录 $sql = "delete from BIZ_TrainOrderCost where TOC_COLI_SN = '{$CCSN}' and TOC_TicketCost is null"; $query=$this->HT->query($sql); - if(empty($data->FOI_TrainNetOrderNo)){ - //退票 - $sql="IF NOT EXISTS( - SELECT TOP 1 1 FROM BIZ_TrainOrderCost - WHERE TOC_COLD_SN = ? AND TOC_Memo like ? - ) - INSERT INTO BIZ_TrainOrderCost( - TOC_Memo, - TOC_CreateDate, - TOC_COLI_SN, - TOC_COLD_SN, - TOC_TrainNumber, - TOC_DepartureDate, - TOC_TicketCost, - TOC_WL, - TOC_VEI_SN - ) - VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),?)"; - $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退票费 ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); - }else{ - //出票 - //BIZ_FlightsOrderInfo.FOI_TrainNetOrderNo,更新取票号 - /* - UPDATE BIZ_FlightsOrderInfo - SET - FOI_TrainNetOrderNo=? - WHERE - FOI_COLD_SN=? - */ - $sql="IF EXISTS( - select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and (FOI_TrainNetOrderNo is null or FOI_TrainNetOrderNo = '' or FOI_TrainNetOrderNo = '$data->FOI_TrainNetOrderNo')) + // if(empty($data->FOI_TrainNetOrderNo)){ //由于取票号不再是必传回来的参数，所以退票单独做一个函数 + // //退票 + // $sql="IF NOT EXISTS( + // SELECT TOP 1 1 FROM BIZ_TrainOrderCost + // WHERE TOC_COLD_SN = ? AND TOC_Memo like ? + // ) + // INSERT INTO BIZ_TrainOrderCost( + // TOC_Memo, + // TOC_CreateDate, + // TOC_COLI_SN, + // TOC_COLD_SN, + // TOC_TrainNumber, + // TOC_DepartureDate, + // TOC_TicketCost, + // TOC_WL, + // TOC_VEI_SN + // ) + // VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),?)"; + // $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退票费 ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); + // }else{ + // } + + + + //---------出票---- + //BIZ_FlightsOrderInfo.FOI_TrainNetOrderNo,更新取票号 + /* + UPDATE BIZ_FlightsOrderInfo + SET + FOI_TrainNetOrderNo=? + WHERE + FOI_COLD_SN=? + */ + $sql="IF EXISTS( + select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and (FOI_TrainNetOrderNo is null or FOI_TrainNetOrderNo = '' or FOI_TrainNetOrderNo = '$data->FOI_TrainNetOrderNo')) + UPDATE BIZ_FlightsOrderInfo + SET + FOI_TrainNetOrderNo='$data->FOI_TrainNetOrderNo' + WHERE + FOI_COLD_SN='$data->TOC_COLD_SN' + ELSE + IF NOT EXISTS(select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and FOI_TrainNetOrderNo LIKE '%$data->FOI_TrainNetOrderNo%') UPDATE BIZ_FlightsOrderInfo - SET - FOI_TrainNetOrderNo='$data->FOI_TrainNetOrderNo' - WHERE - FOI_COLD_SN='$data->TOC_COLD_SN' - ELSE - IF NOT EXISTS(select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and FOI_TrainNetOrderNo LIKE '%$data->FOI_TrainNetOrderNo%') - UPDATE BIZ_FlightsOrderInfo - SET - FOI_TrainNetOrderNo=(select FOI_TrainNetOrderNo from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN') + '&' + '$data->FOI_TrainNetOrderNo' - WHERE - FOI_COLD_SN='$data->TOC_COLD_SN'"; + SET + FOI_TrainNetOrderNo=(select FOI_TrainNetOrderNo from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN') + '&' + '$data->FOI_TrainNetOrderNo' + WHERE + FOI_COLD_SN='$data->TOC_COLD_SN'"; + + $this->HT->query($sql); + + $sql="IF NOT EXISTS( + SELECT TOP 1 1 FROM BIZ_TrainOrderCost + WHERE TOC_COLD_SN = ? AND TOC_Memo like ? + ) + INSERT INTO BIZ_TrainOrderCost( + TOC_Memo, + TOC_CreateDate, + TOC_COLI_SN, + TOC_COLD_SN, + TOC_TrainNumber, + TOC_DepartureDate, + TOC_TicketCost, + TOC_WL, + TOC_OtherCost, + TOC_VEI_SN + ) + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?)"; + + //,(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?) - $this->HT->query($sql); - + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); //,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN + + return $query; + } + + //新增退款记录 refund + public function refund_train_payment($data){ + //主表ID，下面两个地方用到，所以先筛选出来，不知道能不能通过合并提高效率 + $sql="SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN=?"; + $query=$this->HT->query($sql,$data->TOC_COLD_SN); + $query=$query->result(); + $CCSN=$query[0]->COLD_COLI_SN; + //删除多余支付记录 + $sql = "delete from BIZ_TrainOrderCost where TOC_COLI_SN = '{$CCSN}' and TOC_TicketCost is null"; + $query=$this->HT->query($sql); + //退款记录 $sql="IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_TrainOrderCost WHERE TOC_COLD_SN = ? AND TOC_Memo like ? @@ -217,13 +257,12 @@ class BIZ_train_model extends CI_Model { TOC_DepartureDate, TOC_TicketCost, TOC_WL, - TOC_OtherCost, TOC_VEI_SN ) - VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null,?),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1,?)"; - $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage,$data->TOC_VEI_SN)); - } - return $query; + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),?)"; + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退款: ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_VEI_SN)); + + } public function update_cold_planvei_sn($cold_sn,$planveiSn){ diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php index 9792d401..0d9d2531 100644 --- a/application/third_party/trainsystem/models/train_system_model.php +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -190,9 +190,11 @@ class train_system_model extends CI_Model { ts_checkdoor = '{$data->TicketCheck}', ts_elecnumber = '{$data->ElectronicOrderNumber}', ts_orderamount = '{$data->OrderTotleFee}', - ts_operateTradeNo = '{$data->operateTradeNo}', - ts_bookcallback = '{$data->bookcallback}',"; + ts_operateTradeNo = '{$data->operateTradeNo}',"; + //ts_bookcallback = '{$data->bookcallback}', //ts_startime = '{$data->OrderTicketTime}', + }else if(!empty($data->bookcallback)){ + $where .= "ts_bookcallback = '{$data->ts_bookcallback}',"; }else if(!empty($data->confirmcallback)){ $where .= "ts_confirmcallback = '{$data->confirmcallback}',"; }else if(!empty($data->returncallback)){ @@ -283,4 +285,15 @@ class train_system_model extends CI_Model { $query = $this->INFO->query($sql,array($ordernumber)); return $query->result(); } + + //传入COLD_SN，获取trainsystem是否存在此订单，用来判断是否提交过 + function get_submitStatus($cold_sn) { + $sql = "SELECT top 1 ts_cold_sn FROM trainsystem WHERE ts_cold_sn= ?"; + $query = $this->INFO->query($sql, $cold_sn); + if($query->num_rows() == 0){ + return true; + }else{ + return false; + } + } } \ No newline at end of file diff --git a/application/third_party/trainsystem/views/order_list.php b/application/third_party/trainsystem/views/order_list.php index caa069d1..b6c7d017 100644 --- a/application/third_party/trainsystem/views/order_list.php +++ b/application/third_party/trainsystem/views/order_list.php @@ -46,13 +46,14 @@ 车次 出发 到达 - 状态 + 状态 价格 提交时间 所属部门 渠道 出票方式 是否发送邮件 + 反馈 操作 @@ -92,6 +93,7 @@ echo '否'; } ?> + ts_errormsg;?> 详情 diff --git a/application/views/mobile_first/ah-feedback-newest.php b/application/views/mobile_first/ah-feedback-newest.php new file mode 100644 index 00000000..a8660595 --- /dev/null +++ b/application/views/mobile_first/ah-feedback-newest.php @@ -0,0 +1,61 @@ + +
+ + Rated 4.9 out of 5 | + Excellent +
+ Based on 10,000+ reviews + +
+

+ Tour Review +

+
+ + + + + $feedback) {?> + + + + +
+
+ +
+ , + +
+
+
+
\ No newline at end of file diff --git a/application/views/mobile_first/ah-inquiry-form.php b/application/views/mobile_first/ah-inquiry-form.php index 5a7a4d21..efbba598 100644 --- a/application/views/mobile_first/ah-inquiry-form.php +++ b/application/views/mobile_first/ah-inquiry-form.php @@ -5,8 +5,8 @@
-

- Numbers in your group +

+ How would you travel?

- - - - - - +
+

+ When would you travel? +

+ +
+ + +
+
+ + +
+
+ + +
+ +
- +
@@ -34,7 +34,7 @@
- +
diff --git a/application/views/mobile_first/ch-visa-free-tester.php b/application/views/mobile_first/ch-visa-free-tester.php index 3e505bad..4734b45c 100644 --- a/application/views/mobile_first/ch-visa-free-tester.php +++ b/application/views/mobile_first/ch-visa-free-tester.php @@ -1153,7 +1153,7 @@ ready(el => { const selectedOption = airportOrRailwayStation.options[airportOrRailwayStation.selectedIndex]; const indexOf72 = selectedOption.getAttribute('data-hour').indexOf('72'); const indexOf144 = selectedOption.getAttribute('data-hour').indexOf('144'); - + if (diffInDays < 1 || diffInDays > 2 || indexOf72 == -1) { visa72hours = false; error_72hours.show(); @@ -1169,6 +1169,14 @@ ready(el => { if (validateSuccess) { tip_box.show(); reason_box.hide(); + + if (visa72hours) { + qualify_72hours.show(); + } + + if (visa144hours) { + qualify_144hours.show(); + } } else { tip_box.hide(); qualify_no.show(); diff --git a/application/views/mobile_first/gh-feedback-newest.php b/application/views/mobile_first/gh-feedback-newest.php new file mode 100644 index 00000000..a8660595 --- /dev/null +++ b/application/views/mobile_first/gh-feedback-newest.php @@ -0,0 +1,61 @@ + +
+ + Rated 4.9 out of 5 | + Excellent +
+ Based on 10,000+ reviews + +
+

+ Tour Review +

+
+ + + + + $feedback) {?> + + + + +
+
+ +
+ , + +
+
+
+
\ No newline at end of file