diff --git a/application/config/config.php b/application/config/config.php index 0f16de62..1eb2a4d7 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -35,6 +35,9 @@ switch ($_SERVER['SERVER_NAME']) { case 'origin-int.mycht.cn': $base_url = 'https://int.mycht.cn'; break; + case 'origin-gh.mycht.cn': + $base_url = 'https://gh.mycht.cn'; + break; default: $base_url = ''; } @@ -391,22 +394,23 @@ $config['site'] = array( 'vac' => array('site_code' => 'vac', 'site_id' => 95, 'site_lgc' => '6', 'site_url' => 'https://www.viaje-a-china.com', 'site_image_url' => '//imagenes.viaje-a-china.com', 'site_authors' => array('I', 'cyt', 'lmr', 'zyh', 'LLM'), 'site_user' => ',ycc,lmr, zyh,I,cyt,htc,bhn,Tony,zyh,B,J,LLM,LYY,'), 'it' => array('site_code' => 'it', 'site_id' => 168, 'site_lgc' => '8', 'site_url' => 'https://www.viaggio-in-cina.it', 'site_image_url' => '//images.viaggio-in-cina.it', 'site_authors' => array('LZY', 'ZQQ', 'lmr', 'zyh'), 'site_user' => ',ycc,lmr, zyh,LZY,htc,ZQQ,Tony,zyh,B,J,LYY,'), 'ru' => array('site_code' => 'ru', 'site_id' => 102, 'site_lgc' => '7', 'site_url' => 'https://www.chinahighlights.ru', 'site_image_url' => '//images.chinahighlights.ru', 'site_authors' => array('xjj', 'zyy'), 'site_user' => ',ycc,lmr, zyh,xjj,htc,DX,zyy,bhn,Tony,zyh,B,J,LYY,'), - 'wt' => array('site_code' => 'wt', 'site_id' => 172, 'site_lgc' => '2', 'site_url' => 'http://www.iiiyooo.com', 'site_image_url' => '', 'site_authors' => array('ylh', 'lfj', 'wx', 'lzh', 'shw', 'lx'), 'site_user' => ',ycc,lmr, zyh,ylh,lfj,wx,lzh,shw,lx,bhn,B,J,'), - 'tbt' => array('site_code' => 'tbt', 'site_id' => 169, 'site_lgc' => '1', 'site_url' => 'http://www.tibettravel.info', 'site_image_url' => '/images', 'site_authors' => array('wj', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,sfx,J,ZP,'), + 'wt' => array('site_code' => 'wt', 'site_id' => 172, 'site_lgc' => '2', 'site_url' => 'https://www.iiiyooo.com', 'site_image_url' => '', 'site_authors' => array('ylh', 'lfj', 'wx', 'lzh', 'shw', 'lx'), 'site_user' => ',ycc,lmr, zyh,ylh,lfj,wx,lzh,shw,lx,bhn,B,J,'), + 'tbt' => array('site_code' => 'tbt', 'site_id' => 169, 'site_lgc' => '1', 'site_url' => 'https://www.tibettravel.info', 'site_image_url' => '/images', 'site_authors' => array('wj', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,sfx,J,ZP,'), 'sht' => array('site_code' => 'sht', 'site_id' => 96, 'site_lgc' => '1', 'site_url' => 'https://www.shanghaihighlights.com', 'site_image_url' => '//images.shanghaihighlights.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,wj,bhn,wx,lzh,lfj,hwt,thf,vz,sfx,J,ZP,LYY,'), 'yz' => array('site_code' => 'yz', 'site_id' => 89, 'site_lgc' => '1', 'site_url' => 'https://www.yangtzeriver.org', 'site_image_url' => '//images.yangtzeriver.org', 'site_authors' => array('wj', 'vi', 'sfx'), 'site_user' => ',ycc,wj,bhn,hwt,thf,vi,sfx,J,ZP,lyy,'), 'gl' => array('site_code' => 'gl', 'site_id' => 90, 'site_lgc' => '1', 'site_url' => 'https://www.guilinchina.net', 'site_image_url' => '//images.guilinchina.net', 'site_authors' => array('vi', 'sfx'), 'site_user' => ',ycc,vi,bhn,hwt,thf,sfx,J,ZP,lyy,'), - 'mbj' => array('site_code' => 'mbj', 'site_id' => 98, 'site_lgc' => '1', 'site_url' => 'http://www.mybeijingchina.com', 'site_image_url' => '//images.mybeijingchina.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,vz,bhn,hwt,thf,sfx,J,ZP,'), + 'mbj' => array('site_code' => 'mbj', 'site_id' => 98, 'site_lgc' => '1', 'site_url' => 'https://www.mybeijingchina.com', 'site_image_url' => '//images.mybeijingchina.com', 'site_authors' => array('vz', 'sfx'), 'site_user' => ',ycc,vz,bhn,hwt,thf,sfx,J,ZP,'), 'ct' => array('site_code' => 'ct', 'site_id' => 1000, 'site_lgc' => '104', 'site_url' => 'https://www.chinatravel.com', 'site_image_url' => '//images.chinatravel.com', 'site_authors' => array('ll', 'D'), 'site_user' => ',ycc,vz,bhn,J,wj,ll,D,ZP,lyy,'), - 'dct' => array('site_code' => 'dct', 'site_id' => 99, 'site_lgc' => '1', 'site_url' => 'http://www.diychinatours.com', 'site_image_url' => '//images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,syt,gavin,zm,htc,yqw,zl,sw,J,qqs,MGZ,'), - 'cits' => array('site_code' => 'cits', 'site_id' => 10086, 'site_lgc' => '2', 'site_image_url' => '', 'site_url' => 'www.guilincits.com'), + 'dct' => array('site_code' => 'dct', 'site_id' => 99, 'site_lgc' => '1', 'site_url' => 'https://www.diychinatours.com', 'site_image_url' => '//images.chinahighlights.com', 'site_authors' => array('zzy', 'spt', 'yl', 'gavin'), 'site_user' => ',ycc,lmr, zyh,J,shw,B,zzy,WJJ,Tony,pcf,zxy,wst,wz,S,yyg,yxd,wj,sw,yl,hx,spt,wmr,syt,gavin,zm,htc,yqw,zl,sw,J,qqs,MGZ,'), + 'cits' => array('site_code' => 'cits', 'site_id' => 10086, 'site_lgc' => '2', 'site_image_url' => '', 'site_url' => 'https://www.guilincits.com'), 'mct' => array('site_code' => 'mct', 'site_id' => 6, 'site_lgc' => '101', 'site_image_url' => '', 'site_url' => 'https://www.mychinatours.com', 'site_authors' => array('cj')), 'diy' => array('site_code' => 'diy', 'site_id' => 99, 'site_lgc' => '1', 'sitemap_name' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_image_url' => '//images.diychinatours.com', 'site_url' => 'http://www.diychinatours.com', 'site_sitemap' => 'E:/Dropbox/wwwroot/diychinatours.com/information.sitemap.xml', 'site_authors' => array('ycc,lyy')), 'ah' => array('site_code' => 'ah', 'site_id' => 141, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '//images.asiahighlights.com', 'site_url' => 'https://www.asiahighlights.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), 'gh' => array('site_code' => 'gh', 'site_id' => 163, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '//images.globalhighlights.com', 'site_url' => 'https://www.globalhighlights.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), - 'pgr' => array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), - 'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'http://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), - 'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'http://www.beijinghighlights.com', 'site_authors' => array('cj')) + 'pgr' => array('site_code' => 'pgr', 'site_id' => 148, 'site_lgc' => '2', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.peregrine.cn', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), + 'ts' => array('site_code' => 'ts', 'site_id' => 149, 'site_lgc' => '1', 'sitemap_name' => '', 'site_image_url' => '', 'site_url' => 'https://www.trainspread.com', 'site_sitemap' => '', 'site_authors' => array('X', 'sfx'), 'site_user' => array(',ycc,sfx,X,')), + 'bht' => array('site_code' => 'bht', 'site_id' => 6565, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.beijinghighlights.com', 'site_authors' => array('cj')), + 'trippest' => array('site_code' => 'trippest', 'site_id' => 145, 'site_lgc' => '1', 'site_image_url' => '', 'site_url' => 'https://www.trippest.com', 'site_authors' => array('cj')) ); //静态文件生成路径 diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index cc4efd34..c94105c7 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -516,9 +516,10 @@ class Info_amp extends CI_Controller $json = $this->input->get_post('json'); $icid = $this->input->get_post('icid'); if ($json && $icid) { + $code = $this->Logs_model->backup_meta($icid, $json, 'AMP_HISTORY'); echo json_encode(array( "succ" => true, - "info" => $this->Logs_model->backup_meta($icid, $json, 'AMP_HISTORY') + "info" => $this->Logs_model->pick_backup_meta($code) )); } else { echo json_encode(array( @@ -544,11 +545,11 @@ class Info_amp extends CI_Controller } public function pick_history() { - $log_id = $this->input->get_post('log_id'); - if ($log_id) { + $log_action_id = $this->input->get_post('log_action_id'); + if ($log_action_id) { echo json_encode(array( "succ" => true, - "info" => $this->Logs_model->pick_backup_meta($log_id) + "info" => $this->Logs_model->pick_backup_meta($log_action_id) )); } else { echo json_encode(array( diff --git a/application/models/logs_model.php b/application/models/logs_model.php index eb9b01e0..5da075e8 100644 --- a/application/models/logs_model.php +++ b/application/models/logs_model.php @@ -152,21 +152,23 @@ class Logs_model extends CI_Model { //备份信息meta内容,lmr - 2020/03/12 function backup_meta($is_id, $log_content, $meta_code) { - return $this->write('backup_meta_'.$meta_code, $is_id, $log_content); + $add_icid_time_flug = 'backup_meta_'.$meta_code.'_'. $is_id.'_'.time(); + $this->write($add_icid_time_flug, $is_id, $log_content); + return $add_icid_time_flug; } //列表信息meta内容,lmr - 2020/03/23 function list_backup_meta($is_id, $meta_code) { $this->init(); - $this->top_num = 50; + $this->top_num = 100; $this->log_res_id = " AND il.log_res_id =" . $this->HT->escape($is_id); - $this->log_action = " AND il.log_action = 'backup_meta_".$meta_code."'"; + $this->log_action = " AND il.log_action like 'backup_meta_".$meta_code."_%'"; return $this->get_list(); } //制定读取信息meta内容,lmr - 2020/03/23 - function pick_backup_meta($log_id) { + function pick_backup_meta($action) { $this->init(); $this->top_num = 1; - $this->log_id = " AND il.log_id =" . $this->HT->escape($log_id); + $this->log_action = " AND il.log_action =" . $this->HT->escape($action); return $this->get_list(); } diff --git a/application/third_party/searchinfo/controllers/index.php b/application/third_party/searchinfo/controllers/index.php new file mode 100644 index 00000000..43919390 --- /dev/null +++ b/application/third_party/searchinfo/controllers/index.php @@ -0,0 +1,30 @@ +load->view('bootstrap3/header'); + $this->load->view('homepage'); + $this->load->view('bootstrap3/footer'); + } + + public function search_error_urls(){ + $sitecode = $this->input->get_post('sitecode'); + $errorurl = $this->input->get_post('errorurl'); + + if(empty($sitecode) && empty($errorurl)){ + echo '请选择站点或填写url'; + }else{ + //查询url + $this->load->model('infos_model'); + $pages = $this->infos_model->get_errorurls_pages($sitecode,$errorurl); + print_r(json_encode($pages)); + } + } +} \ No newline at end of file diff --git a/application/third_party/searchinfo/models/infos_model.php b/application/third_party/searchinfo/models/infos_model.php new file mode 100644 index 00000000..62987942 --- /dev/null +++ b/application/third_party/searchinfo/models/infos_model.php @@ -0,0 +1,15 @@ +HT = $this->load->database('HT', TRUE); + } + + function get_errorurls_pages($sitecode,$errorurl) { + $sql = "select ic_url from infoContents where ic_sitecode = ? and ic_content like '%{$errorurl}%'"; + $query = $this->HT->query($sql,array($sitecode)); + return $query->result(); + } +} \ No newline at end of file diff --git a/application/third_party/searchinfo/views/homepage.php b/application/third_party/searchinfo/views/homepage.php new file mode 100644 index 00000000..8a841d90 --- /dev/null +++ b/application/third_party/searchinfo/views/homepage.php @@ -0,0 +1,78 @@ +
+
+
+
+

查询信息

+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ 查询页面 +
+
+
+
+

查询url所在页面列表

+
+
+
+
+
+
+
+
+
+
+ diff --git a/application/third_party/trainsystem/controllers/addorders.php b/application/third_party/trainsystem/controllers/addorders.php index 2a2b7671..57564aae 100644 --- a/application/third_party/trainsystem/controllers/addorders.php +++ b/application/third_party/trainsystem/controllers/addorders.php @@ -594,14 +594,14 @@ class addorders extends CI_Controller{ $PostData['TrainOrderService']->Order->OrderTime = $time; $PostData['TrainOrderService']->Order->OrderMedia = 'pc'; - $PostData['TrainOrderService']->Order->TicketItem = new stdClass(); - $PostData['TrainOrderService']->Order->TicketItem->FromStationName = $data['train']->DepartAirport_cn; - $PostData['TrainOrderService']->Order->TicketItem->ToStationName = $data['train']->ArrivalAirport_cn; - $PostData['TrainOrderService']->Order->TicketItem->TicketTime = date('Y-m-d H:i:s',strtotime($data['train']->DepartureTime)); - $PostData['TrainOrderService']->Order->TicketItem->TrainNumber = $data['train']->FlightsNo; - $PostData['TrainOrderService']->Order->TicketItem->ArrivalDateTime = date('Y-m-d H:i:s',strtotime($data['train']->ArrivalTime)); - $PostData['TrainOrderService']->Order->TicketItem->TicketPrice = $data['train']->adultcost; - $PostData['TrainOrderService']->Order->TicketItem->TicketCount = count($data['people_list']); + $PostData['TrainOrderService']->Order->TicketItem['0'] = new stdClass(); + $PostData['TrainOrderService']->Order->TicketItem['0']->FromStationName = $data['train']->DepartAirport_cn; + $PostData['TrainOrderService']->Order->TicketItem['0']->ToStationName = $data['train']->ArrivalAirport_cn; + $PostData['TrainOrderService']->Order->TicketItem['0']->TicketTime = date('Y-m-d H:i:s',strtotime($data['train']->DepartureTime)); + $PostData['TrainOrderService']->Order->TicketItem['0']->TrainNumber = $data['train']->FlightsNo; + $PostData['TrainOrderService']->Order->TicketItem['0']->ArrivalDateTime = date('Y-m-d H:i:s',strtotime($data['train']->ArrivalTime)); + $PostData['TrainOrderService']->Order->TicketItem['0']->TicketPrice = $data['train']->adultcost; + $PostData['TrainOrderService']->Order->TicketItem['0']->TicketCount = count($data['people_list']); $AdultNum = 0; $ChildNum = 0; @@ -654,28 +654,27 @@ class addorders extends CI_Controller{ $i++; } - $PostData['TrainOrderService']->Order->TicketItem->AuditTicketCount = $AdultNum; - $PostData['TrainOrderService']->Order->TicketItem->ChildTicketCount = $ChildNum; - $PostData['TrainOrderService']->Order->TicketItem->SeatName = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; - $PostData['TrainOrderService']->Order->TicketItem->SelectedSeat = $selectseat; + $PostData['TrainOrderService']->Order->TicketItem['0']->AuditTicketCount = $AdultNum; + $PostData['TrainOrderService']->Order->TicketItem['0']->ChildTicketCount = $ChildNum; + $PostData['TrainOrderService']->Order->TicketItem['0']->SeatName = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; + $PostData['TrainOrderService']->Order->TicketItem['0']->SelectedSeat = $selectseat; $is_accept_standing = ''; if($this->istanding == 'true'){ $is_accept_standing = '无座'; } - $PostData['TrainOrderService']->Order->TicketItem->AcceptSeat = $is_accept_standing; + $PostData['TrainOrderService']->Order->TicketItem['0']->AcceptSeat = $is_accept_standing; //乘客人信息 - $PostData['TrainOrderService']->Order->TicketItem->Passengers = $passagersdata; - $PostData['TrainOrderService']->Order->TicketItem->OrderPrice = $data['train']->adultcost * $AdultNum + $data['train']->childcost * $ChildNum; + $PostData['TrainOrderService']->Order->TicketItem['0']->Passengers = $passagersdata; + $PostData['TrainOrderService']->Order->TicketItem['0']->OrderPrice = $data['train']->adultcost * $AdultNum + $data['train']->childcost * $ChildNum; - $PostData['TrainOrderService']->Order->User = new stdClass(); - $PostData['TrainOrderService']->Order->User->UserID = ''; - $PostData['TrainOrderService']->Order->User->UserName = 'guilintravel'; - $PostData['TrainOrderService']->Order->User->userLoginName = 'guilintravel'; - $PostData['TrainOrderService']->Order->User->UserMobile = '18877381547'; - //print_r(json_encode($PostData)); - //die(); + $PostData['TrainOrderService']->User = new stdClass(); + $PostData['TrainOrderService']->User->UserID = ''; + $PostData['TrainOrderService']->User->UserName = 'guilintravel'; + $PostData['TrainOrderService']->User->userLoginName = 'guilintravel'; + $PostData['TrainOrderService']->User->UserMobile = '18877381547'; + //本地添加记录 $add_data = new stdClass(); $add_data->cold_sn = $cold_sn; @@ -697,15 +696,10 @@ class addorders extends CI_Controller{ //存储到数据库 $this->train_system_model->add_orders($add_data); - - //$Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerAddOrder'; - $Url = 'http://apiproxy.fws.ctripqa.com/apiproxy/soa2/13680/json/PartnerAddOrder'; + $Url = 'http://apiproxy.ctrip.com/apiproxy/soa2/13680/PartnerAddOrder'; $ResponseJson = GetPost_http($Url,json_encode($PostData),'json'); $ResponseData = json_decode($ResponseJson); - echo '预定'; - print_r($ResponseData);die(); - //预定请求成功后执行支付 if($ResponseData->Status == 'SUCCESS'){ //计算订单总价，进行支付 @@ -745,7 +739,7 @@ class addorders extends CI_Controller{ $PostData['TrainOrderService']->PayTime = $time; //$PostData['TrainOrderService']->TradeNumber = $time; - $Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerPayOrder'; + $Url = 'http://apiproxy.ctrip.com/apiproxy/soa2/13680/PartnerPayOrder'; $ResponseJson = GetPost_http($Url,json_encode($PostData),'json'); $ResponseData = json_decode($ResponseJson); diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php index 78d9175e..cf535712 100644 --- a/application/third_party/trainsystem/controllers/callback.php +++ b/application/third_party/trainsystem/controllers/callback.php @@ -262,6 +262,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $tickets_item->OrderTicketPrice; $data_passager->seatype = $tickets_item->OrderTicketSeat; $data_passager->seatdetail = $ticket_item2->SeatNo; + $data_passager->longtrainno = $ticket_item2->LongTrainNo; $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } @@ -273,6 +274,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $tickets_item->OrderTicketPrice; $data_passager->seatype = $tickets_item->OrderTicketSeat; $data_passager->seatdetail = $tickets_item->DetailInfos->DetailInfo->SeatNo; + $data_passager->longtrainno = $tickets_item->DetailInfos->DetailInfo->LongTrainNo; $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } @@ -289,6 +291,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; $data_passager->seatdetail = $items->SeatNo; + $data_passager->longtrainno = $items->LongTrainNo; $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } @@ -304,6 +307,7 @@ class callback extends CI_Controller{ $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; $data_passager->seatdetail = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->SeatNo; + $data_passager->longtrainno = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->LongTrainNo; $data_passager->TOC_VEI_SN = 28209; $this->train_system_model->add_passagers($data_passager); } diff --git a/application/third_party/trainsystem/controllers/reschedule.php b/application/third_party/trainsystem/controllers/reschedule.php index 57bc376a..6d0ae056 100644 --- a/application/third_party/trainsystem/controllers/reschedule.php +++ b/application/third_party/trainsystem/controllers/reschedule.php @@ -76,7 +76,7 @@ class reschedule extends CI_Controller{ } //print_r(json_encode($postData));die(); - $url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerReschedule'; + $url = 'http://apiproxy.ctrip.com/apiproxy/soa2/13680/PartnerReschedule'; $responseJson = GetPost_http($url,json_encode($postData),'json'); print_r($responseJson); } diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php index d470d81d..c8f23786 100644 --- a/application/third_party/trainsystem/controllers/returnorders.php +++ b/application/third_party/trainsystem/controllers/returnorders.php @@ -145,39 +145,15 @@ class returnorders extends CI_Controller{ $PostData['TrainOrderService']->contactMobile = '18877381547'; $PostData['TrainOrderService']->OrderNumber = $ticket_data->ts_ordernumber; $PostData['TrainOrderService']->OperatorType = '0'; - $PostData['TrainOrderService']->TicketInfo = ''; - $PostData['TrainOrderService']->TicketInfo = array(); + $PostData['TrainOrderService']->LongElecNums = array(); + $PostData['TrainOrderService']->LongElecNums['0'] = $passenger_data->tst_LongTrainNo; - $i = 0; - $PostData['TrainOrderService']->TicketInfo[$i]['eOrderNumber'] = $passenger_data->ts_elecnumber; - if($passenger_data->tst_ticketype == '儿童票'){ - $PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '2'; - }else{ - $PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '1'; - } - $PostData['TrainOrderService']->TicketInfo[$i]['seatNumber'] = $passenger_data->tst_seatdetail; - $PostData['TrainOrderService']->TicketInfo[$i]['passportName'] = $passenger_data->tst_realname; - $PostData['TrainOrderService']->TicketInfo[$i]['passport'] = $passenger_data->tst_numberid; - $PostData['TrainOrderService']->TicketInfo[$i]['realName'] = $passenger_data->tst_realname; - //发起退票请求 - $Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerReturnTicket'; + $Url = 'http://apiproxy.ctrip.com/apiproxy/soa2/13680/PartnerReturnTicket'; $ResponseJson = GetPost_http($Url,json_encode($PostData),'json'); $ResponseData = json_decode($ResponseJson); if($ResponseData->Status == 'SUCCESS'){ - $fromName = 'trainsystem'; - $fromEmail = 'cyc@hainatravel.com'; - $coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($ticket_data->ts_cold_sn); - $coli_id = $coli_id['0']->COLI_ID; - $info = $this->BIZ_train_model->get_operatorInfo($coli_id); - $toName = $info[0]->OPI_Name; - $toEmail = $info[0]->OPI_Email; - $Mobile = $info[0]->Mobile; - $subject = '退票请求'; - $body = '乘客:'.$data->tst_realname.' 对订单:'.$data->ts_ordernumber.'发起退票请求！！！'; - //发送邮件给外联 - $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); echo '{"reason":"退票成功","status":"200"}'; }else{ header("HTTP/1.1 404 Not Found"); diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php index dbf149dd..cb1b2794 100644 --- a/application/third_party/trainsystem/models/train_system_model.php +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -145,7 +145,8 @@ class train_system_model extends CI_Model { tst_ticketprice = '{$data->ticketprice}', tst_seatstype = '{$data->seatype}', tst_seatdetail = '{$data->seatdetail}', - tst_status = '{$data->status}' + tst_status = '{$data->status}', + tst_LongTrainNo = '{$data->longtrainno}' where tst_ordernumber = '{$data->ordernumber}' and @@ -162,7 +163,8 @@ class train_system_model extends CI_Model { tst_ticketype, tst_ticketprice, tst_seatstype, - tst_seatdetail + tst_seatdetail, + tst_LongTrainNo )VALUES( '{$data->ordernumber}', '{$data->status}', @@ -172,7 +174,8 @@ class train_system_model extends CI_Model { '{$data->ticketype}', '{$data->ticketprice}', '{$data->seatype}', - '{$data->seatdetail}' + '{$data->seatdetail}', + '{$data->longtrainno}' ) "; $query =$this->INFO->query($sql); diff --git a/application/third_party/trainsystem/views/homepage.php b/application/third_party/trainsystem/views/homepage.php index 56f0d64e..49127619 100644 --- a/application/third_party/trainsystem/views/homepage.php +++ b/application/third_party/trainsystem/views/homepage.php @@ -297,13 +297,13 @@ function selseat(seat){ - + diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index 9198161e..d9c90ea3 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -86,6 +86,7 @@
  • 广告管理
  • TA评论采集
  • 老旧信息查询
    • +
  • 信息搜索
  • AMP转化检查
  • Html基础知识
  • AMP知识
    • diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index a3bc18e5..ccf78f4c 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -110,6 +110,7 @@
  • 广告管理
  • TA评论采集
  • 老旧信息查询
    • +
  • 信息搜索
  • AMP转化检查
  • Html基础知识
  • AMP知识
    • diff --git a/download_statement/download_files.php b/download_statement/download_files.php index 7e9c48a4..f1d948e5 100644 --- a/download_statement/download_files.php +++ b/download_statement/download_files.php @@ -12,6 +12,9 @@ $target_folder = null; $targer_day = null; // 获取前一天的对账单 $target_folder = str_replace("-", "/", date("Y-m", strtotime("-1 day")) ); // 2018/07 +$targer_date = explode('/', $target_folder); +$target_year = $targer_date[0]; +$target_month = $targer_date[1]; if (isset($_GET['f'])) { $target_folder = $_GET['f']; // f=2018/06 f=2018/07/23 $target_set = explode('/', $target_folder); @@ -22,10 +25,17 @@ if (isset($_GET['f'])) { } $file_list = array_values(array_diff($sftp->nlist($target_folder), array(".",".."))); if ($targer_day !== null) { - $file_list = array($target_set[0] . $target_set[1] . $target_set[2] . ".xlsx"); + $day_file_name = $target_set[0] . $target_set[1] . $target_set[2]; + $target_file_list = array_map(function ($ele) use ($day_file_name) + { + return stripos($ele, $day_file_name)===false ? null : $ele; + }, $file_list); + $file_list = array_values(array_filter($target_file_list)); + // $file_list = array($target_set[0] . $target_set[1] . $target_set[2] . ".xlsx"); } // target local -$target_local = "statement_files/" . $target_folder; +$target_local = "settlement_files/ipaylinks-" . $target_folder; +// $target_local = "statement_files/ipaylinks-" . $target_folder; if ( ! is_dir($target_local)) { mkdir($target_local, 0777, true); } @@ -47,5 +57,7 @@ echo "
    new_files ", json_encode($new_files); echo "
    file_list ", json_encode($file_list); // header("Location: http://www.mycht.cn/webht.php/apps/pay/ipaylinksservice/auto_update_statement?f=$target_folder&fjson=" . json_encode($new_files)); -header("Location: http://www.mycht.cn/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files)); +// header("Location: http://www.mycht.cn/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files)); + $yestoday = date("Y/m/d", strtotime("-1 day")); + header("Location: http://www.mycht.cn/webht.php/apps/pay/paymentservice/ipalinks_settlement/$yestoday"); // header("Location: http://202.103.68.79:8083/webht.php/apps/pay/report/ipaylinks_excel?f=$target_folder&fjson=" . json_encode($new_files)); diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index d377f861..e10dbe22 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -619,6 +619,10 @@ class PaymentService extends CI_Controller { $target_folder = "ipaylinks-" . $year; $target_file = $year . "-" . $month; // $target_file .= ($day===null) ? null : ("-" . $day); + if ($day !== null) { + $target_folder .= "\\" . $month; + $target_file = $year . $month . $day . "_transaction"; + } $statement_folder = FCPATH.'download_statement\settlement_files\\' . $target_folder; if ( ! is_dir($statement_folder)) { echo "read folder failed"; @@ -765,21 +769,21 @@ class PaymentService extends CI_Controller { // $data['from_date'] = date("Y-m-d", strtotime("-8 days")); // $data['to_date'] = date("Y-m-d", strtotime("-1 days")); $data['from_date'] = date("Y-m-01", strtotime("-1 month")); - $data['to_date'] = date("Y-m-01"); + $data['to_date'] = date("Y-m-01 23:59:59"); } else { $data['from_date'] = $date_range_arr[0][0]; $data['to_date'] =$date_range_arr[0][1] . " 23:59:59"; if ($data['to_date'] == null) { - $data['to_date'] = date("Y-m-d H:i:s", strtotime("+1 month", strtotime($data['from_date']))-1); + $data['to_date'] = date("Y-m-d 23:59:59", strtotime("+1 month", strtotime($data['from_date']))-1); } } $data['at_year'] = date('Y-01-01', strtotime($data['to_date'])); - $data['day_cnt'] = calc_day_cnt($data['from_date'], $data['to_date']); + $data['day_cnt'] = calc_day_cnt($data['from_date'], $data['to_date'])+1; $data['from_date_quarter'] = date('Y-m-d', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['from_date']))); - $data['to_date_quarter'] = date('Y-m-d', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['to_date']))); + $data['to_date_quarter'] = date('Y-m-d 23:59:59', strtotime("-" . $data['day_cnt'] . " days ", strtotime($data['to_date']))); $data['from_date_year'] = date('Y-m-d', strtotime("-1 year ", strtotime($data['from_date']))); - $data['to_date_year'] = date('Y-m-d', strtotime("-1 year ", strtotime($data['to_date']))); + $data['to_date_year'] = date('Y-m-d 23:59:59', strtotime("-1 year ", strtotime($data['to_date']))); $data['data']['pay'] = $this->note_model->total_by_method('pay', $data['from_date'], $data['to_date'], @@ -787,7 +791,6 @@ class PaymentService extends CI_Controller { $data['from_date_year'], $data['to_date_year'], $data['at_year'] ); - array_walk($data['data']['pay'], 'PaymentService::set_brandname'); $data['data']['refund'] = $this->note_model->total_by_method('refund', $data['from_date'], $data['to_date'], @@ -795,10 +798,10 @@ class PaymentService extends CI_Controller { $data['from_date_year'], $data['to_date_year'], $data['at_year'] ); + array_walk($data['data']['pay'], 'PaymentService::set_brandname'); array_walk($data['data']['refund'], 'PaymentService::set_brandname'); - - $data['data']['income'] = array(); bcscale(4); + $data['data']['income'] = array(); foreach ($data['data']['pay'] as $key => $pay) { $income_tmp = new stdClass(); foreach ($data['data']['refund'] as $key => $refund) { @@ -809,12 +812,12 @@ class PaymentService extends CI_Controller { $income_tmp->method_total_income_cmp = bcadd($pay->method_total_income_cmp, $refund->method_total_income_cmp); $income_tmp->year_method_total_income = bcadd($pay->year_method_total_income, $refund->year_method_total_income); $income_tmp->this_year_method_total_income = bcadd($pay->this_year_method_total_income, $refund->this_year_method_total_income); - $income_tmp->quarter_rate = $income_tmp->method_total_income_cmp==0 ? 0 : + $income_tmp->quarter_rate = $income_tmp->method_total_income_cmp==0 ? 100 : bcdiv( bcsub($income_tmp->method_total_income, $income_tmp->method_total_income_cmp), ($income_tmp->method_total_income_cmp) )*100; - $income_tmp->year_rate = $income_tmp->year_method_total_income==0 ? 0 : + $income_tmp->year_rate = $income_tmp->year_method_total_income==0 ? 100 : bcdiv( bcsub($income_tmp->method_total_income, $income_tmp->year_method_total_income), ($income_tmp->year_method_total_income) diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php index ab1efaac..12a77b3a 100644 --- a/webht/third_party/pay/controllers/WxpayService.php +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -94,6 +94,7 @@ class WxpayService extends CI_Controller { } async_curl($this->config->item('send_notify_url', 'wxpay')); async_curl('https://www.mycht.cn/webht.php/apps/pay/alipaytradeservice/get_billfile'); + async_curl('https://www.mycht.cn/download_statement/download_files.php'); // iPaylinks日账单 /** * 每月20号发送退款给财务 */ diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index 2a43b0c3..a20a0f12 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -1107,6 +1107,16 @@ class IPayLinksService extends CI_Controller return $reponse; } + public function test_curl() + { + $url = $this->input->get_post('url'); + $data = $this->curl($url); + $json = json_decode($data); + echo $json->tls_version; + var_dump($json); + return; + } + /*! * 检验非空 * @author LYT diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index 0c4b0d2f..f0f3b65f 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -281,27 +281,27 @@ class Online_payment_note_model extends CI_Model { OPN_entryAmountCNY , OPN_completeTime - SELECT OPN_accountMethod + SELECT isnull(cal.select_date_method,ISNULL(cal.last_method,ISNULL(cal.year_method, cal.this_year_method ))) as OPN_accountMethod ,method_total_income,method_total_income_cmp ,isnull(year_method_total_income,0) year_method_total_income ,this_year_method_total_income --,REPLACE(CONVERT(VARCHAR, CONVERT(MONEY, method_total_income), 1), '.00', '') method_total_income --,REPLACE(CONVERT(VARCHAR, CONVERT(MONEY, method_total_income_cmp), 1), '.00', '') method_total_income_cmp - ,CONVERT(decimal(10,2), + ,case when ISNULL( method_total_income_cmp,0)=0 then 100 else CONVERT(decimal(10,2), round( (method_total_income-method_total_income_cmp)/method_total_income_cmp*100 ,2 ) - ) AS quarter_rate + ) end AS quarter_rate --,REPLACE(CONVERT(VARCHAR, CONVERT(MONEY, isnull(year_method_total_income,0)), 1), '.00', '') year_method_total_income - ,CONVERT(decimal(10,2), + ,case when ISNULL( year_method_total_income,0)=0 then 100 else CONVERT(decimal(10,2), round( (method_total_income-year_method_total_income)/year_method_total_income*100 ,2 ) - ) AS year_rate + ) end AS year_rate --,REPLACE(CONVERT(VARCHAR, CONVERT(MONEY, this_year_method_total_income), 1), '.00', '') this_year_method_total_income FROM ( SELECT * FROM ( - SELECT OPN_accountMethod + SELECT OPN_accountMethod,OPN_accountMethod select_date_method ,SUM( ISNULL( CONVERT(decimal(10,2),OPN_entryAmountCNY), Tourmanager.dbo.GetSSJEFromSQJE( @@ -316,25 +316,7 @@ class Online_payment_note_model extends CI_Model { and OPN_noticeType=@type GROUP BY OPN_accountMethod ) AS method - INNER JOIN - ( - SELECT SUM( - [Tourmanager].[dbo].ZeroToOne( - ISNULL( CONVERT(decimal(10,2),OPN_entryAmountCNY), - Tourmanager.dbo.GetSSJEFromSQJE( - OPN_accountMethod, - REPLACE(OPN_currency, 'CNY', 'RMB'), - CONVERT(decimal(10,2),OPN_orderAmount) - ) - - ) - ) - ) AS total_income - FROM @unique_opn - WHERE OPN_completeTime BETWEEN @from_date AND @to_date - and OPN_noticeType=@type - ) AS total ON 1=1 - inner join ( + full join ( SELECT OPN_accountMethod last_method ,SUM( [Tourmanager].[dbo].ZeroToOne( @@ -353,7 +335,7 @@ class Online_payment_note_model extends CI_Model { and OPN_noticeType=@type GROUP BY OPN_accountMethod ) as cmp on method.OPN_accountMethod=cmp.last_method - left join ( + full join ( SELECT OPN_accountMethod year_method ,SUM( [Tourmanager].[dbo].ZeroToOne( @@ -372,7 +354,7 @@ class Online_payment_note_model extends CI_Model { and OPN_noticeType=@type GROUP BY OPN_accountMethod ) as year_cmp on method.OPN_accountMethod=year_cmp.year_method - left join ( + full join ( SELECT OPN_accountMethod this_year_method ,SUM( [Tourmanager].[dbo].ZeroToOne( diff --git a/webht/third_party/pay/views/income.php b/webht/third_party/pay/views/income.php index adbb039b..624da686 100644 --- a/webht/third_party/pay/views/income.php +++ b/webht/third_party/pay/views/income.php @@ -147,7 +147,19 @@ - $method) { ?> + $method) { + $sum_total_income += $method->method_total_income; + $sum_method_total_income_cmp += $method->method_total_income_cmp; + $sum_year_method_total_income += $method->year_method_total_income; + $sum_this_year_method_total_income += $method->this_year_method_total_income; + ?> brand_name ?> method_total_income, 2, '.', ',') ?> @@ -157,7 +169,27 @@ year_rate, 2, '.', ',') . '%' ?> this_year_method_total_income, 2, '.', ',') ?> - + + + 合计 + + + + + + + diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index ee759e48..ca03bf00 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -282,6 +282,10 @@ class TulanduoApi extends CI_Controller if (intval($order->COLI_OPI_ID) === 435) { $this->order_cancel($order->COLI_ID); } + if ($order->COLI_SN===null) { + $this->plan_cancel($order->GCI_VendorOrderId); + return; + } // return; } $allDetails_to_HT = ""; @@ -302,7 +306,7 @@ class TulanduoApi extends CI_Controller $allDetails_to_HT .= "[". $vtc->remark . "]; "; } } - if (strval($detail_jsonResp->orderDetail->orderStatus) !== '1') { + if (strval($detail_jsonResp->orderDetail->orderStatus) === '0') { if ( $output===true) { echo "not confirm"; } /** groupcombineinfo */ $this->Order_update->gci_where_update = " GCI_VendorOrderId='" . $detail_jsonResp->orderDetail->orderId . "' and GCI_VEI_SN in (" . implode(',', $this->vendor_ids) . ")"; // 不明确指定供应商id,出现过不对应的情况 diff --git a/webht/third_party/trippestOrderSync/controllers/vendor_money.php b/webht/third_party/trippestOrderSync/controllers/vendor_money.php index af0258fc..77ee9898 100644 --- a/webht/third_party/trippestOrderSync/controllers/vendor_money.php +++ b/webht/third_party/trippestOrderSync/controllers/vendor_money.php @@ -297,6 +297,8 @@ class Vendor_money extends CI_Controller { $ret['default_vendor'] = $vendors; $vendor_sourcetype = $this->trippest->vendor_sourcetype(); $ret['no_check_cancel'] = $this->money_model->get_cancel_not_check($start_date, $end_date, implode(',' ,$vendors)); + // 综费协议 但是却同步到成本 + $ret['agreement_diff'] = $this->money_model->agreement_diff($start_date, $end_date, implode(',' ,$vendors)); // price [Trippest receipts & agency receipts] $ret['price_error'] = $this->money_model->get_precheck_price_error($start_date, $end_date, implode(',' ,$vendors)); // 仅更新成本数据, 后重新获取 diff --git a/webht/third_party/trippestOrderSync/models/vendor_money_model.php b/webht/third_party/trippestOrderSync/models/vendor_money_model.php index 85041a45..08327f75 100644 --- a/webht/third_party/trippestOrderSync/models/vendor_money_model.php +++ b/webht/third_party/trippestOrderSync/models/vendor_money_model.php @@ -392,8 +392,11 @@ class Vendor_money_model extends CI_Model { -- AND CGI_ArriveDate BETWEEN '$start_date' AND '$end_date') and exists ( select 1 from BIZ_ConfirmLineInfo - inner join BIZ_ConfirmLineDetail on COLI_SN=COLD_COLI_SN - where COLI_GRI_SN=GCI_GRI_SN + inner join BIZ_ConfirmLineDetail d on COLI_SN=COLD_COLI_SN + left join BIZ_PackageOrderInfo poi on poi.POI_COLD_SN=d.COLD_SN + where COLI_GRI_SN=GCI_GRI_SN and d.DeleteFlag=0 + and isnull(poi_quotationType,0)<>4 + and d.COLD_PlanVEI_SN in ($all_vendor) and COLD_StartDate BETWEEN '$start_date' AND '$end_date' ) ) AS group_cost @@ -768,6 +771,64 @@ ORDER BY to_be_diff.GCI_VEI_SN return $query->result_array(); } + public function agreement_diff($start_date, $end_date, $all_vendor) + { + $sql = "SELECT * + ,ROUND( dbo.GetSSJEFromSQJE( + (select top 1 GAI_Type from BIZ_GroupAccountInfo b where gai_coli_sn=coli_sn and b.DeleteFlag=0) + ,COLI_Currency,com_sum_price),2) as com_Currency_CNY_price + ,ROUND( dbo.GetSSJEFromSQJE( + (select top 1 GAI_Type from BIZ_GroupAccountInfo b where gai_coli_sn=coli_sn and b.DeleteFlag=0) + ,COLI_Currency,not_com_sum_price),2) as not_com_Currency_CNY_price + --,ROUND( dbo.GetSSJEFromSQJE( + -- (select top 1 GAI_Type from BIZ_GroupAccountInfo b where gai_coli_sn=coli_sn and b.DeleteFlag=0) + -- ,'USD',com_sum_price),2) as USD_CNY_price + ,(select SUM(GAI_SSJE) from BIZ_GroupAccountInfo gai where gai.GAI_COLI_SN=COLI_SN and gai.DeleteFlag=0) as total_income + from ( + select + COLI_ID,COLI_GroupCode,COLI_SN,COLI_Currency,COLI_GRI_SN + ,( + select SUM(cold.COLD_TotalPrice) from BIZ_ConfirmLineDetail cold + left join BIZ_PackageOrderInfo poi on poi.POI_COLD_SN=cold.COLD_SN + where cold.COLD_COLI_SN=coli.COLI_SN + and COLD_StartDate between '$start_date' and '$end_date' + and cold.DeleteFlag=0 + and poi_quotationType=4 + and COLD_PlanVEI_SN in ($all_vendor) + ) as com_sum_price + ,isnull(( + select SUM(cold.COLD_TotalPrice) from BIZ_ConfirmLineDetail cold + left join BIZ_PackageOrderInfo poi on poi.POI_COLD_SN=cold.COLD_SN + where cold.COLD_COLI_SN=coli.COLI_SN + and COLD_StartDate between '$start_date' and '$end_date' + and cold.DeleteFlag=0 + and isnull(poi_quotationType,0)<>4 + and COLD_PlanVEI_SN in ($all_vendor) + ),0) as not_com_sum_price + ,isnull(( + select SUM(CONVERT(decimal(10,2), isnull(GCI_priceCNY,0))) from GroupCombineInfo where GCI_GRI_SN=coli.COLI_GRI_SN + and isnull(GCI_combineNo,'') not in ('','cancel','forbidden') + ),0) as in_gci + from + BIZ_ConfirmLineInfo coli + where exists ( + select 1 from OperatorInfo where OPI_DEI_SN=30 and OPI_SN=COLI_OPI_ID + ) + and exists ( + select 1 from BIZ_ConfirmLineDetail cold + left join BIZ_PackageOrderInfo poi on poi.POI_COLD_SN=cold.COLD_SN + where cold.COLD_COLI_SN=coli.COLI_SN + and COLD_StartDate between '$start_date' and '$end_date' + and cold.DeleteFlag=0 + and poi_quotationType=4 + and COLD_PlanVEI_SN in ($all_vendor) + ) + ) as all_comprehensive + where in_gci>0 "; + $query = $this->HT->query($sql); + return $query->result_array(); + } + } /* End of file vendor_money.php */ diff --git a/webht/third_party/trippestOrderSync/views/order_report_precheck.php b/webht/third_party/trippestOrderSync/views/order_report_precheck.php index 7ca7b208..2c376c99 100644 --- a/webht/third_party/trippestOrderSync/views/order_report_precheck.php +++ b/webht/third_party/trippestOrderSync/views/order_report_precheck.php @@ -177,6 +177,51 @@ + +

    + + + + + + + + + + + + + + + $vad) { ?> + + + + + + + + + +
    + [ 第〇步 ] 解决结算协议异常 + 订单在HT中设置为综费协议结算, 不应在excel账单中, 请核实后重新设置结算协议 或 更新excel账单 +
    HT团号报价: 综费协议报价: 目的地协议地接账单: 总团款(从同步数据)HT总收款
    +   + + + (≈ CNY ) + + +   + + + (≈ CNY ) + +
    + +

    @@ -364,6 +409,7 @@
  • 其他值