diff --git a/.gitignore b/.gitignore index f4ff3920..47901456 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.idea +.phpintel .svn/* */logs/log* /web.config @@ -7,5 +9,5 @@ /author/document/* */statement_files/* */paypal_activities/* -test122.php -/test122/* +/author/document/* +/application/libraries/composer diff --git a/application/config/config.php b/application/config/config.php index 100d3fd2..684dda6a 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -563,42 +563,6 @@ $config['InfoType_citizen'] = array( '产品' => 'product' ); -//可选模板 -$config['templates'] = array( - '通用内容模板' => 'guide_info_detail', - '城市-列表模板' => 'city_info_list', - '城市-首页模板' => 'city_info_index', - '城市-首页模板[简]' => 'city_info_s_index', - '城市-景点列表模板' => 'city_info_attractions_list', - '城市-景点列表模板[简]' => 'city_info_s_attractions_list', - '城市-景点详细模板' => 'city_attractions', - '城市-特色产品模板' => 'city_info_diytour', - '城市-一线城市首页' => 'city_info_index_one', - '省份-首页' => "area_info_index", - '省份-列表模板' => 'area_info_list', - '省份-通用内容模板' => 'area_info_detail', - '文化模板 [列表式]' => "culture_info_detail_just_list", - '文化模板 [单页式]' => 'culture_info_detail_one_page', - '文化模板 [导航式]' => 'culture_info_detail_with_category', - '信息专题模板' => 'guide_top_series', - '火车专题模板' => 'train_top_series', - '旅游攻略' => 'travel_story', - '节庆-详细模板' => 'festival_detail', - '节庆-列表模板' => 'festival_list', - '大使馆-详细页' => 'embassy_info_detail', - '城市-线路详细' => 'city_circuit', - '专题模板（大）' => 'guide_big_series', - '[国际站]响应式-空白模板' => 'r_tpl_empty', - '[国际站]响应式-专题首页' => 'r_tpl_empty_navi0', - '[国际站]响应式-专题列表页' => 'r_tpl_empty_navi1', - '[国际站]响应式-专题列表页+' => 'r_tpl_empty_navi1p', - '[国际站]响应式-专题详细页' => 'r_tpl_empty_navi2', - '[-------已废弃-------]空白模板' => 'tpl_empty', - '[-------已废弃-------]专题-温暖' => 'warm', - '[-------已废弃-------]专题-庄重' => 'solemn', - '[-------已废弃-------]专题-节庆' => 'festival', - '[-------已废弃-------]专题-线路促销' => 'promotion_tour' -); //可选模板 $config['templates_i'] = array( @@ -607,7 +571,9 @@ $config['templates_i'] = array( '[城市]C首页模板' => 'city_info_index', '[城市]C景点列表模板' => 'city_info_attractions_list', '[城市]C景点详细模板' => 'city_attractions', - '[专题]T0空白模板' => 'r_tpl_empty', + '[专题]T0空白' => 'r_tpl_empty', + '[专题]T0空白（HTML构建工具）' => 'r_empty_container', + '[专题]T0空白（H1+面包屑）' => 'r_empty2', '----------二级目录----------' => '------2------', '[专题]T2首页' => 'r_t2_index', '[专题]T2详细' => 'r_t2_detail', @@ -651,6 +617,7 @@ $config['area_type'] = array( '大使馆' => 'y', '公民游' => 'z', '交换链接' => 'k', + '首页' => 'h', 'FAQ' => 'q' ); @@ -693,24 +660,25 @@ $config['media_image_url_remote2'] = 'http://116.251.217.48:3581/upload'; //是否开启权限控制 $config['check_access'] = TRUE; //权限管理超级管理 -$config['access_super_manage'] = array('ycc', 'lmr'); +$config['access_super_manage'] = array('ycc', 'lmr', 'lyj'); //编辑器预览样式路径 -$config['css_source_cht'] = ''; +$config['css_source_cht'] = ''; -$config['css_source_gm'] = ''; +$config['css_source_gm'] = ''; -$config['css_source_vc'] = ''; -$config['css_source_vac'] = ''; -$config['css_source_ru'] = ''; -$config['css_source_it'] = ''; -$config['css_source_jp'] = ''; +$config['css_source_vc'] = ''; +$config['css_source_vac'] = ''; +$config['css_source_ru'] = ''; +$config['css_source_it'] = ''; +$config['css_source_jp'] = ''; -$config['css_source_sht'] = ''; -$config['css_source_gl'] = ''; -$config['css_source_tbt'] = ''; -$config['css_source_mbj'] = ''; -$config['css_source_yz'] = ''; +$config['css_source_sht'] = ''; +$config['css_source_gl'] = ''; +$config['css_source_tbt'] = ''; +$config['css_source_mbj'] = ''; +$config['css_source_yz'] = ''; +$config['css_source_ah'] = ''; @@ -900,11 +868,45 @@ $config['InfoType_citizen'] = array( '产品' => 'product' ); +//ct站点用到了 +$config['InfoType_ct'] = array( + '不设置' => 'none', + '首页' => 'root', + '简介' => 'c_overview', + '关于' => 'c_about', + '食物' => 'c_food', + '食物详细' => 'c_food_detail', + '餐饮' => 'c_restaurant', + '餐饮详细' => 'c_restaurant_detail', + '历史' => 'c_history', + 'Facts信息' => 'c_facts', + '旅游' => 'c_travel', + '交通' => 'c_transport', + '交通详细' => 'c_transport_detail', + '地图' => 'c_map', + '地图详细' => 'c_map_detail', + '天气' => 'c_weather', + '天气详细' => 'c_weather_detail', + '购物' => 'c_shopping', + '夜生活' => 'c_nightlife', + '旅游建议' => 'c_tips', + '景点概述' => 'c_attraction', + '景点详细' => 'c_attraction_detail', + '推荐做的' => 'c_toptodo', + '城市article' => 'c_article', + '产品' => 'c_product', + '产品详细' => 'c_product_detail', + '游记' => 'story', + '一地线路详细' => 'c_single_circuit', + '一日游线路详细' => 'c_day_tour' +); + //可选模板 $config['templates'] = array( '通用内容模板' => 'guide_info_detail', '城市-列表模板' => 'city_info_list', '城市-首页模板' => 'city_info_index', + '城市-首页模板(GM)' => 'city_info_index_new', '城市-首页模板[简]' => 'city_info_s_index', '城市-景点列表模板' => 'city_info_attractions_list', '城市-景点列表模板[简]' => 'city_info_s_attractions_list', @@ -940,6 +942,47 @@ $config['templates'] = array( 'food列表' => 'food_list' ); +//德语信息模板 +$config['templates_gm'] = array( + '通用内容模板' => 'guide_info_detail', + '城市-首页模板(GM)' => 'city_info_index', + '文化模板 [单页式]' => 'culture_info_detail_one_page', + '文化模板 [导航式]' => 'culture_info_detail_with_category', + '信息专题模板' => 'guide_top_series', + '列表式' => 'guide_info_list', + '空白模板'=>'none' +); + +// CHT 信息模板 +$config['templates_cht'] = array( + '通用内容模板' => 'guide_info_detail', + '城市-列表模板' => 'city_info_list', + '城市-首页模板' => 'city_info_index', + '城市-首页模板[简]' => 'city_info_s_index', + '城市-景点列表模板' => 'city_info_attractions_list', + '城市-景点列表模板[简]' => 'city_info_s_attractions_list', + '城市-特色产品模板' => 'city_info_diytour', + '城市-一线城市首页' => 'city_info_index_one', + '省份-首页' => "area_info_index", + '省份-列表模板' => 'area_info_list', + '省份-通用内容模板' => 'area_info_detail', + '文化模板 [列表式]' => "culture_info_detail_just_list", + '文化模板 [单页式]' => 'culture_info_detail_one_page', + '文化模板 [导航式]' => 'culture_info_detail_with_category', + '信息专题模板' => 'guide_top_series', + '火车专题模板' => 'train_top_series', + '旅游攻略' => 'travel_story', + '节庆-详细模板' => 'festival_detail', + '节庆-列表模板' => 'festival_list', + '大使馆-详细页' => 'embassy_info_detail', + '城市-线路详细' => 'city_circuit', + '专题模板（大）' => 'guide_big_series', + '三峡游船' => 'yangtze', + '城市article列表' => 'city_article_list', + 'food列表' => 'food_list', + 'FAQ模板' => 'faq_detail' +); + //产品管理板块模板 $config['templates_product'] = array( '空白模板' => 'none', @@ -947,6 +990,7 @@ $config['templates_product'] = array( //产品管理板块模板（国际站使用） $config['templates_product_i'] = array( + '空白模板（HTML构建工具）' => 'r_empty_container', '空白模板（新）' => 'r_tpl_empty_2017', '空白模板（旧）' => 'r_tpl_empty', ); @@ -1031,9 +1075,6 @@ $config['media_image_url_org'] = 'http://photo.chtcdn.com:3581/upload'; $config['media_image_url_remote'] = 'http://photo.chtcdn.com/upload'; $config['media_image_url_remote2'] = 'http://116.251.217.48:3581/upload'; -//编辑器预览样式路径 -$config['css_source_cht'] = ''; -$config['css_source_ah'] = ''; /* End of file config.php */ /* Location: ./application/config/config.php */ diff --git a/application/controllers/CT_AMP_Loader.php b/application/controllers/CT_AMP_Loader.php new file mode 100644 index 00000000..27ba257b --- /dev/null +++ b/application/controllers/CT_AMP_Loader.php @@ -0,0 +1,59 @@ +load->model('information_model'); + $this->load->model('InfoMetas_model'); + //$this->load->library('Tags_analysis'); + } + + // http://localhost:8002/guide-use.php/amp_loader/test/?info_url=/yangtzecruise/ + /** + * 加载已经发布的页面 + */ + public function load() { + $info_url = $this->input->get_post('info_url'); + $webcode = $this->input->get_post('webcode'); + if(!isset($webcode) ) { + $webcode="ct"; + } + // $info_url="/yangtzecruise/"; + // $webcode="cht"; + + $information_detail = $this->information_model->ct_get_by_url($info_url, $webcode); + $ic_id = $information_detail->ic_id; + $meta_amp_status = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS'); + if ($meta_amp_status) { + $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); + //$include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $meta_amp_html; + } else { + header('HTTP/1.1 404 Not Found'); + header("status: 404 Not Found"); + show_404(); + exit; + } + } + + // http://localhost:8002/guide-use.php/amp_loader/test/?info_url=/yangtzecruise/ + /** + * 测试保存的页面 + */ + public function test() { + // $info_url = $this->input->get_post('info_url'); + $info_url = "/yangtzecruise/"; + $information_detail = $this->information_model->ct_get_by_url($info_url, "cht"); + if (empty($information_detail)) { + echo $info_url.'没有信息类型'; + } + $ic_id = $information_detail->ic_id; + $meta_amp_html = $this->InfoMetas_model->get($ic_id, 'AMP'); + //$include_price_html = $this->tags_analysis->replace_price_tag($meta_amp_html); + echo $meta_amp_html; + } +} diff --git a/application/controllers/amp.php b/application/controllers/amp.php index e24c449a..e7e5c374 100644 --- a/application/controllers/amp.php +++ b/application/controllers/amp.php @@ -11,52 +11,25 @@ class Amp extends CI_Controller { //$this->output->enable_profiler(TRUE); $this->load->model('Information_model'); $this->load->model('InfoMetas_model'); + $this->load->library('Amplib'); } public function index() { $data = array(); $this->load->view('bootstrap3/header', $data); - $this->load->view('amp_editor'); $this->load->view('bootstrap3/footer'); } public function edit($ic_id) { - $data = array(); - $data['information'] = $this->Information_model->detail_by_ic_id($ic_id); - if ($data['information'] == FALSE) { - show_404(); - } - $this->load->view('bootstrap3/header', $data); - $this->load->view('amp_editor'); - $this->load->view('bootstrap3/footer'); + $this->amplib->edit($ic_id); + } + + public function auto_create($ic_id) { + echo $this->amplib->auto_create($ic_id); } public function edit_save() { - $data = array(); - $ic_id = $this->input->post('ic_id'); - $textarea_htmlcode = $this->input->post('textarea_htmlcode'); - $amp_status = $this->input->post('amp_status'); - $data['information'] = $this->Information_model->detail_by_ic_id($ic_id); - if ($data['information'] == FALSE) { - show_404(); - } - - $amp = $this->InfoMetas_model->get($ic_id, 'AMP'); - if ($amp === false) { - $this->InfoMetas_model->add($ic_id, 'AMP', $textarea_htmlcode); - } else { - $this->InfoMetas_model->update($ic_id, 'AMP', $textarea_htmlcode); - } - - $amp_status_value = $this->InfoMetas_model->get($ic_id, 'AMP_STATUS'); - if ($amp_status_value === false) { - $this->InfoMetas_model->add($ic_id, 'AMP_STATUS', $amp_status); - } else { - $this->InfoMetas_model->update($ic_id, 'AMP_STATUS', $amp_status); - } - - $data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success')); - echo json_encode($data); + echo $this->amplib->edit_save(); } } diff --git a/application/controllers/home.php b/application/controllers/home.php new file mode 100644 index 00000000..c351dfc8 --- /dev/null +++ b/application/controllers/home.php @@ -0,0 +1,42 @@ +permission->is_admin(); + //$this->output->enable_profiler(TRUE); + $this->load->model('Area_model'); + $this->load->model('Information_model'); + $this->load->model('InfoContents_model'); + $this->load->model('InfoStructures_model'); + } + + //站点首页 + public function index() + { + $home_id=1; + //查询结构根节点，当为空则建立 + $rootStructure = $this->Information_model->GetRoot('h', $home_id); + if ($rootStructure == FALSE) + { + $this->InfoContents_model->Add('', 'HomePage', 'root', '', '', '', '', '', '', 0, 0, '', '', 0, 0, '', '', $home_id, 'h', 0, + '',''); + $this->InfoStructures_model->Add(0, $this->InfoContents_model->insert_id); + $is_id = $this->InfoStructures_model->insert_id; + } + else + { + $is_id = $rootStructure->is_id; + } + redirect(site_url('information/edit/' . $is_id)); + } + + +} + diff --git a/application/controllers/info_amp.php b/application/controllers/info_amp.php index 4e77ad13..99ac7662 100644 --- a/application/controllers/info_amp.php +++ b/application/controllers/info_amp.php @@ -12,60 +12,86 @@ class Info_amp extends CI_Controller //$this->permission->is_admin(); $this->load->model('InfoMetas_model'); $this->load->model('InfoContents_model'); + $this->load->model('Information_model'); $this->site_code = $this->config->item('site_code'); - //CORS TEST - header('Access-Control-Allow-Origin:*'); + //CORS + header('Access-Control-Allow-Origin:*'); + header('Access-Control-Allow-Methods:GET,PUT,POST,DELETE,OPTIONS'); + header('Access-Control-Allow-Headers:Content-Type,Authorization,Content-Length,X-Requested-With,Accept,x-csrf-token,origin'); } public function save_amp() { - $icid = $this->input->post('icid'); - $json = $this->input->post('json'); - $html = $this->input->post('html'); - $css = $this->input->post('css'); - $schema = $this->input->post('schema'); - $script = $this->input->post('script'); - $status = $this->input->post('status'); + $icid = $this->input->get_post('icid'); + $json = $this->input->get_post('json'); + $html = $this->input->get_post('html'); + $pc_html = $this->input->get_post('pc_html'); + $pc_css = $this->input->get_post('pc_css'); + $css = $this->input->get_post('css'); + $schema = $this->input->get_post('schema'); + $script = $this->input->get_post('script'); + $status = $this->input->get_post('status'); + + //如果源信息的内容为空，则插入内容。 + $info = $this->InfoContents_model->get_ic_contents2($icid); + if ($info && empty($info->ic_content)) { + $this->InfoContents_model->force_update($icid, ''.$pc_html); + } + if ($icid && $json && $html) { try { //html $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_BODY', $html); } else { $this->InfoMetas_model->update($icid, 'AMP_BODY', $html); } + //pc_html + $meta = $this->InfoMetas_model->get($icid, 'AMP_BODY_PC'); + if ($meta === FALSE) { + $this->InfoMetas_model->add($icid, 'AMP_BODY_PC', $pc_html); + } else { + $this->InfoMetas_model->update($icid, 'AMP_BODY_PC', $pc_html); + } + //pc_css + $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS_PC'); + if ($meta === FALSE) { + $this->InfoMetas_model->add($icid, 'AMP_CSS_PC', $pc_css); + } else { + $this->InfoMetas_model->update($icid, 'AMP_CSS_PC', $pc_css); + } //json $meta = $this->InfoMetas_model->get($icid, 'AMP_JSON'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_JSON', $json); } else { $this->InfoMetas_model->update($icid, 'AMP_JSON', $json); } //css $meta = $this->InfoMetas_model->get($icid, 'AMP_CSS'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_CSS', $css); } else { $this->InfoMetas_model->update($icid, 'AMP_CSS', $css); } //script $meta = $this->InfoMetas_model->get($icid, 'AMP_SCRIPT'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCRIPT', $script); } else { $this->InfoMetas_model->update($icid, 'AMP_SCRIPT', $script); } //schema $meta = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_SCHEMA', $schema); } else { $this->InfoMetas_model->update($icid, 'AMP_SCHEMA', $schema); } //status $meta = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); - if ($meta === false) { + if ($meta === FALSE) { $this->InfoMetas_model->add($icid, 'AMP_STATUS', $status); } else { $this->InfoMetas_model->update($icid, 'AMP_STATUS', $status); @@ -89,7 +115,7 @@ class Info_amp extends CI_Controller public function load_amp() { - $icid = $this->input->post('icid'); + $icid = $this->input->get_post('icid'); if (!$icid) { echo json_encode(array( "succ" => false, @@ -97,6 +123,42 @@ class Info_amp extends CI_Controller )); return false; } + //信息~返回信息 + $ic = $this->InfoContents_model->get_ic_contents2($icid); + if (empty($ic)) { + echo json_encode(array( + "succ" => false, + "message" => "load_amp() -> 无信息" + )); + return false; + } + switch (strtolower($ic->ic_sitecode)) { + case 'vac': + $site = 'https://www.viaje-a-china.com'; + break; + case 'vc': + $site = 'https://www.voyageschine.com'; + break; + case 'jp': + $site = 'https://www.arachina.com'; + break; + case 'ru': + $site = 'https://www.chinahighlights.ru'; + break; + case 'it': + $site = 'https://www.viaggio-in-cina.it'; + break; + case 'cht': + $site = 'https://www.chinahighlights.com'; + break; + case 'gm': + $site = 'https://www.chinarundreisen.com/'; + break; + default: + $site = ''; + break; + } + $json = $this->InfoMetas_model->get($icid, 'AMP_JSON'); $status = $this->InfoMetas_model->get($icid, 'AMP_STATUS'); $schema = $this->InfoMetas_model->get($icid, 'AMP_SCHEMA'); @@ -104,6 +166,7 @@ class Info_amp extends CI_Controller echo json_encode(array( "succ" => true, "icid" => $icid, + "icurl" => $site.$ic->ic_url, "json" => $json, "schema" => $schema, "status" => $status @@ -116,17 +179,142 @@ class Info_amp extends CI_Controller } } + public function list_amp() + { + $site = $this->input->get_post('site'); + switch ($site) { + case 'https://www.viaje-a-china.com': + $site_code = 'vac'; + break; + case 'https://www.voyageschine.com': + $site_code = 'vc'; + break; + case 'https://www.arachina.com': + $site_code = 'jp'; + break; + case 'https://www.chinahighlights.ru': + $site_code = 'ru'; + break; + case 'https://www.viaggio-in-cina.it': + $site_code = 'it'; + break; + case 'https://www.chinahighlights.com': + $site_code = 'cht'; + break; + case 'https://www.chinarundreisen.com/': + $site_code = 'gm'; + break; + default: + $site_code = false; + break; + } + if (!$site_code) { + echo json_encode(array( + "succ" => false, + "message" => "list_amp() -> 参数传递错误。" + )); + return false; + } + $rs = $this->InfoMetas_model->list_amp($site_code); + if (!empty($rs)) { + echo json_encode($rs); + } else { + echo json_encode(array( + "succ" => false, + "message" => "load_amp() -> 无数据返回。" + )); + } + } + + public function list_info_children() + { + $site = $this->input->get_post('site'); + switch ($site) { + case 'https://www.viaje-a-china.com': + $site_code = 'vac'; + break; + case 'https://www.voyageschine.com': + $site_code = 'vc'; + break; + case 'https://www.arachina.com': + $site_code = 'jp'; + break; + case 'https://www.chinahighlights.ru': + $site_code = 'ru'; + break; + case 'https://www.viaggio-in-cina.it': + $site_code = 'it'; + break; + case 'https://www.chinahighlights.com': + $site_code = 'cht'; + break; + case 'https://www.chinarundreisen.com/': + $site_code = 'gm'; + break; + default: + $site_code = false; + break; + } + $is_path = $this->input->get_post('is_path'); // '25693,278002094,' + if (!$site_code || !$is_path) { + echo json_encode(array( + 'succ' => false, + 'message' => 'list_info_children() -> 参数传递错误。' + )); + return false; + } + $rs = $this->InfoMetas_model->list_info_by_path_with_meta($is_path, $site_code); + if (!empty($rs)) { + $newrs = array(); + foreach ($rs as $info) { + $show_photo_meta = $this->InfoMetas_model->get($info->ic_id, 'meta_use_list_picture'); + if ($show_photo_meta == 'no') { + $use_photo = ''; + } else { + $use_photo = $this->config->item('site_image_url').$info->ic_photo; + } + if ($info->ic_type === 'c_attraction' || $info->ic_template === 'city_info_attractions_list' || $info->ic_template === 'r_tpl_empty_navi1p') { + $list_info = true; + } else { + $list_info = false; + } + if ($list_info || !empty($info->ic_content) && !empty($info->ic_url) && stripos($info->ic_url, '/test/')===false) { + array_push($newrs, array( + 'is_path' => $info->is_path, + 'ic_url' => $info->ic_url, + 'ic_id' => $info->ic_id, + 'title' => $info->ic_title, + 'photo' => $use_photo, + 'im_id' => $info->im_id + )); + } + } + echo json_encode($newrs); + } else { + echo json_encode(array( + "succ" => false, + "message" => "list_info_children() -> 无数据返回。" + )); + } + } + public function load_info() { - $icid = $this->input->post('icid'); + $icid = $this->input->get_post('icid'); if ($icid) { $ic = $this->InfoContents_model->get_ic_contents2($icid); if ($ic) { + $show_photo_meta = $this->InfoMetas_model->get($icid, 'meta_use_list_picture'); + if ($show_photo_meta == 'no') { + $use_photo = ''; + } else { + $use_photo = $this->config->item('site_image_url').$ic->ic_photo; + } echo json_encode(array( "succ" => true, - "info" => $ic->ic_content, + "info" => $ic->ic_content ? $ic->ic_content : "

".$ic->ic_seo_description."

", "title" => $ic->ic_title, - "photo" => $this->config->item('site_image_url').$ic->ic_photo, + "photo" => $use_photo, "url" => $ic->ic_url, "site" => $this->config->item('site_url') )); @@ -144,5 +332,180 @@ class Info_amp extends CI_Controller } } -} + public function handel_png_source() { + //ini_set('memory_limit', '50M'); + $png_base64 = $this->input->post('png_base64'); + //$png_base64 = 'iVBORw0KGgoAAAANSUhEUgAAABwAAAASCAMAAAB/2U7WAAAABlBMVEUAAAD///+l2Z/dAAAASUlEQVR4XqWQUQoAIAxC2/0vXZDrEX4IJTRkb7lobNUStXsB0jIXIAMSsQnWlsV+wULF4Avk9fLq2r8a5HSE35Q3eO2XP1A1wQkZSgETvDtKdQAAAABJRU5ErkJggg=='; + $file = md5($png_base64).'.jpg'; + $path = realpath('../cht-system/views/information/word_img').'/'.$file; + $png_base64 = str_replace('data:image/png;base64,', '', $png_base64); + $png_base64 = str_replace('data:image/jpg;base64,', '', $png_base64); + $png_base64 = base64_decode($png_base64); + $im = imagecreatefromstring($png_base64); + //保存图像 + imagejpeg($im, $path); + //释放内存 + imagedestroy($im); + $size = getimagesize($path); + if($png_base64 && $size) { + echo(json_encode(array( + 'status' => 'success', + 'path' => '/information-view/information/word_img/'.$file, + 'width' => $size[0], + 'height' => $size[1] + ))); + } else { + echo(json_encode(array( + 'status' => 'error' + ))); + } + } + public function handel_image_source() { + @ini_set('memory_limit', '256M'); + $file = $_FILES['file']; + if (!$file) { + echo(json_encode(array( + 'status' => 'error', + 'msg' => "图片上传失败。" + ))); + return; + } + $usr = $this->input->post('usr'); + $icid = $this->input->post('icid'); + //转移文件 + $md5_file = md5($usr.$icid.$file['name']); + //ext + $ext = mb_strtolower(strrchr($file["name"],'.')); + if ($ext != '.jpg') { + echo(json_encode(array( + 'status' => 'error', + 'msg' => '只能接收(.jpg)图片。', + 'filename' => $file["name"] + ))); + return; + } + $md5_name = $md5_file.$ext; + //临时docx文件 + $image_path = realpath('../cht-system/views/information/word_img').'/'.basename($md5_name); + $html = 'to use mammoth'; + if (move_uploaded_file($file['tmp_name'], $image_path)) { + //图片处理 + $im = imagecreatefromjpeg($image_path); + imagejpeg($im, $image_path); + imagedestroy($im); + $size = getimagesize($image_path); + if($size) { + echo(json_encode(array( + 'status' => 'success', + 'path' => '/information-view/information/word_img/'.$md5_name, + 'width' => $size[0], + 'height' => $size[1] + ))); + } else { + echo(json_encode(array( + 'status' => 'error' + ))); + } + } else { + echo(json_encode(array( + 'status' => 'error', + 'msg' => "图片文件解析失败。" + ))); + } + } + + public function handel_word_source() { + @ini_set('memory_limit', '256M'); + $file = $_FILES['file']; + if (!$file) { + echo(json_encode(array( + 'status' => 'error', + 'msg' => "文件上传失败。" + ))); + return; + } + $usr = $this->input->post('usr'); + $icid = $this->input->post('icid'); + //转移文件 + $md5_file = md5($usr.$icid.$file['name']); + //ext + $ext = mb_strtolower(strrchr($file["name"],'.')); + if ($ext != '.docx') { + echo(json_encode(array( + 'status' => 'error', + 'msg' => '只能接收word(.docx)文档。' + ))); + return; + } + $md5_name = $md5_file.$ext; + //临时docx文件 + $docx_path = realpath('../cht-system/views/information/word_source').'/'.basename($md5_name); + $html = 'to use mammoth'; + if (move_uploaded_file($file['tmp_name'], $docx_path)) { + $docx_dir = realpath('../cht-system/views/information/word_source'); + //图片及html目录 + $img_dir = $docx_dir.'/'.$md5_file; + is_dir($img_dir) || mkdir($img_dir, 0777); + //临时html文件 + $docx_parh = $img_dir.'/'.$md5_name; + $html_parh = str_ireplace('.docx', '.html', $docx_parh); + //运行docx转化插件 + if ($_SERVER['SERVER_NAME'] == 'localhost' || $_SERVER['SERVER_NAME'] == '202.103.68.62') { + $yarnbin = 'C:\Users\cht77\AppData\Local\Yarn\bin\mammoth '; + $test_host = '//202.103.68.62:9096'; + } else { + $yarnbin = 'C:\Users\lmr\AppData\Local\Yarn\bin\mammoth '; + $test_host = ''; + } + $command = $yarnbin.$docx_path.' --output-dir='.$img_dir. ' 2>&1'; + //$command = 'C:\Users\lmr\AppData\Local\Yarn\bin\mammoth -h 2>&1'; + exec($command, $rs, $st); + //图片处理 + $scan_img = scandir($img_dir); + $tmp = ''; + foreach($scan_img as $f) { + $tmp_ext = mb_strtolower(strrchr($f, '.')); + if ($tmp_ext == '.jpeg') { + $tmp_img = $img_dir.'/'.$f; + $tmp_jpg = str_ireplace('.jpeg', '.jpg', $tmp_img); + $im = imagecreatefromjpeg($tmp_img); + imagejpeg($im, $tmp_jpg); + imagedestroy($im); + //删除临时图片 + @unlink($tmp_img); + //$tmp .= $f . ' # '; + } + } + //html处理 + if (file_exists($html_parh)) { + $html = file_get_contents($html_parh); + } else { + echo(json_encode(array( + 'status' => 'error', + 'html' => $command.' # '.$html_parh, + 'rs' => print_r($rs, true).' # '.$st + ))); + return; + } + $html = preg_replace('/src="([\d]+).jpeg"/i', 'src="'.$test_host.'/information-view/information/word_source/'.$md5_file.'/$1.jpg"', $html); + //删除临时html + @unlink($html_parh); + //删除docx文档 + @unlink($docx_path); + if ($html) { + echo(json_encode(array( + 'status' => 'success', + 'path' => $docx_path, + 'html' => $html + ))); + } + } else { + echo(json_encode(array( + 'status' => 'error', + 'msg' => "word文件解析失败。" + ))); + } + } + +} diff --git a/application/controllers/information.php b/application/controllers/information.php index 33912e01..d3d18193 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -1,737 +1,725 @@ -permission->is_admin(); - //$this->output->enable_profiler(TRUE); - $this->load->model('Area_model'); - $this->load->model('Information_model'); - $this->load->model('InfoContents_model'); - $this->load->model('InfoStructures_model'); - $this->load->model('Landscape_model'); - $this->load->model('Operator_model'); - $this->load->model('Logs_model'); - $this->load->model('InfoMetas_model'); - $this->load->model('Infoauthors_model'); - $this->load->model('InfoKeywordsanalytics_model', 'analytics_model'); - $this->load->model('InfoSMS_model'); - - if (is_series_site()) { - $this->load->model('InfoTags_model'); - } - - $this->load->library('Accesscheck'); - $this->accesscheck->check_access(); - } - - public function index() { - echo '信息首页'; - } - - public function add($is_parent_id) { - //添加空内容. - $this->InfoContents_model->Add('', 'New Information', '', '', '', '', '', '', '', 0, 0, '', '', 0, 0, '', '', 0, '', 0, '', ''); - $infocontent = $this->InfoContents_model->get_ic_contents($this->InfoContents_model->insert_id); - if (!empty($infocontent) && $this->InfoStructures_model->Add($is_parent_id, $this->InfoContents_model->insert_id)) { - $is_id = $this->InfoStructures_model->insert_id; - $InfoStructures = $this->InfoStructures_model->Detail($is_id); - $InfoStructures->is_id = $is_id; - $data[] = array('name' => 'ok', 'value' => $InfoStructures); - $this->Logs_model->add($this->InfoStructures_model->insert_id); - } else { - $data[] = array('name' => 'no', 'value' => $this->lang->line('form_info_error')); - } - echo json_encode($data); - return TRUE; - } - - //移动结构顺序 - public function move() { - //网站会提交一个同级节点id列表字符串，按照这个去排序 - $parent_id = $this->input->post('pid'); - $idsStr = $this->input->post('ids'); - $idsArray = explode(',', $idsStr); - foreach ($idsArray as $key => $value) { - if ($value) { - //设置排序 - $this->InfoStructures_model->set_sort($value, $key); - //设置path - $this->InfoStructures_model->set_path($parent_id, $value); - } - } - $data[] = array('name' => 'ok', 'value' => $this->lang->line('structures_success_move')); - echo json_encode($data); - $this->Logs_model->move($idsStr); - return TRUE; - } - - //把文章移动到任意板块文章下 - //is_id 信息结构ID，is_parent_id即将转移到的信息结构id - public function move_by_is_id() { - $data = array(); - $is_id = $this->input->post('is_id'); - $is_parent_id = $this->input->post('is_parent_id'); - if ($is_id == $is_parent_id || empty($is_id) || empty($is_parent_id)) { - return false; - } - //即将移动到文章结构信息 - $Structure = $this->InfoStructures_model->Detail($is_id); - //目标文章结构信息 - $Structure_parent = $this->InfoStructures_model->Detail($is_parent_id); - //只能移动到本站点下 - if ($Structure->is_sitecode == $Structure_parent->is_sitecode) { - //不能搬迁到自己的子节点下 - if (strpos(',' . $Structure_parent->is_path, ',' . $is_id . ',') == false) { - $this->InfoStructures_model->set_path($is_parent_id, $is_id); - } - //信息的区域类型和id也要修改 todo - } - $data[] = array('name' => 'ok', 'value' => $this->lang->line('structures_success_move')); - echo json_encode($data); - $this->Logs_model->move($is_id); - return TRUE; - } - - public function delete($is_id) { - //查询结构信息 - $Structure = $this->InfoStructures_model->Detail($is_id); - if ($Structure == FALSE) { - $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_notfound')); - echo json_encode($data); - return false; - } - if ($this->InfoStructures_model->HasChild($Structure->is_id)) { - $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_haschild')); - echo json_encode($data); - return false; - } else { - $info_detail = $this->Information_model->Detail($is_id); - $this->Logs_model->delete($is_id, $info_detail->ic_content); - if (!empty($info_detail->ic_summary)) { - $this->Logs_model->backup_summary($is_id, $info_detail->ic_summary); - } - $this->InfoStructures_model->Delete($Structure->is_id); - $this->InfoContents_model->Delete($Structure->is_ic_id); - //如果是已经发布的页面，删除静态文件 - if ($info_detail->ic_status == 1) { - $this->update_cache($info_detail->ic_url, true); - } - //删除成功后返回一个上级链接给用户 - $drumpurl = site_url('information/edit/' . $Structure->is_parent_id); - if ($Structure->is_parent_id == 0) - $drumpurl = site_url('/'); - $data[] = array('name' => 'ok', 'value' => $drumpurl); - echo json_encode($data); - return true; - } - } - - public function edit($is_id) { - header("Cache-Control: no-store, no-cache, must-revalidate, post-check=0, pre-check=0"); - header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); - set_time_limit(30); - //$this->output->enable_profiler(true); - //查询结构信息 - $Structure = $this->InfoStructures_model->Detail($is_id); - if ($Structure == FALSE) { - show_404(); - } - //查询结构根节点 - $rootStructure = $this->InfoStructures_model->GetParent($Structure->is_path, 1); - //没有根节点就从它本身开始查询 - if ($rootStructure == false) { - $rootStructure_ID = $Structure->is_id; - } else { - $rootStructure_ID = $rootStructure->is_id; - } - - //查询结构列表信息 - //$data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); - $data['informationList'] = $this->accesscheck->get_info_structure($rootStructure_ID); - if (!$data['informationList']) { - redirect(site_url('Login/refuse')); - } - $data['is_writeable'] = $this->accesscheck->get_edit_type($Structure->is_path); - - //增加一项，属于这个区域，但是结构数据层次不准确的也要列出来 - //todo: - //信息内容 - $data['information'] = $this->Information_model->Detail($is_id); - - //检查该信息是否已收录 - $data['embody'] = 1; - if (isset($data['information']->ic_id)) { - $embody = $this->InfoMetas_model->get($data['information']->ic_id, 'meta_embody'); - if ($embody && $embody != '1') { - $data['embody'] = 0; - } - //设置该信息所有未读消息为已读 - $this->InfoSMS_model->readed_for_info($data['information']->ic_id); - } - - //主节点信息 - $data['rootInformation'] = $this->Information_model->Detail($rootStructure_ID); - //获取未绑定的景点,只有城市有，无视其它区域类型 - $data['unlink_landscape_list'] = array(); - - //可选的展示模板 - if (in_array($this->config->item('site_code'), array('vac', 'vc', 'jp', 'ru', 'it'))) { - $this->config->set_item('templates', $this->config->item('templates_i')); - } - - if (in_array($this->config->item('site_code'), array('ah'))) { - $this->config->set_item('templates', $this->config->item('templates_ah')); - } - if (in_array($this->config->item('site_code'), array('pgr'))) { - $this->config->set_item('templates', $this->config->item('templates_pgr')); - } - if (in_array($this->config->item('site_code'), array('ts'))) { - $this->config->set_item('templates', $this->config->item('templates_ts')); - } - - //信息区域类型 - switch ($data['rootInformation']->ic_ht_area_type) { - case 'c': //城市 - $data['infoTypeList'] = $this->config->item('InfoType_city'); - $data['unlink_landscape_list'] = $this->Information_model->get_unlink_landscape_list($data['rootInformation']->ic_ht_area_id); - break; - case 'p'://省份 - $data['infoTypeList'] = $this->config->item('InfoType_province'); - break; - case 'n'://国家 - $data['infoTypeList'] = $this->config->item('InfoType_country'); - break; - case 't'://特殊区域 - $data['infoTypeList'] = $this->config->item('InfoType_special'); - break; - case 'e'://大洲 - $data['infoTypeList'] = array(); - break; - case 'z'://公民游 - $data['infoTypeList'] = $this->config->item('InfoType_citizen'); - break; - case 'v'://视频 - $data['infoTypeList'] = $this->config->item('InfoType_video'); - break; - case 'f'://节庆 - $data['infoTypeList'] = $this->config->item('InfoType_festival'); - break; - case 'pd'://产品管理 - $data['infoTypeList'] = $this->config->item('InfoType_product'); - //LMR 2016-7-14 - if (in_array($this->config->item('site_code'), array('vac', 'vc', 'jp', 'ru', 'it'))) { - $this->config->set_item('templates', $this->config->item('templates_product_i')); - } else { - $this->config->set_item('templates', $this->config->item('templates_product')); - } - break; - default: - $data['infoTypeList'] = array(); - break; - } - - - - $data['templateList'] = $this->config->item('templates'); - //翰特产品类型 - $data['productTypeList'] = $this->config->item('ProductType_HT'); - //获取绑定的产品名称 - switch ($data['information']->ic_ht_product_type) { - case 't': - $data['product_title'] = $this->Landscape_model->get_landscape_title($data['information']->ic_ht_product_id); - break; - default: - $data['product_title'] = ''; - break; - } - //获取最后更新者信息 - $data['last_edit_info'] = $this->Logs_model->get_last_edit($is_id); - - //编辑列表 - $sites = $this->config->item('site'); - $data['editor_list'] = $this->Operator_model->get_site_user($this->config->item('site_code')); - //获取作者列表 - $data['author_list'] = $this->Infoauthors_model->get_site_user($this->config->item('site_code')); - - //获取备份信息记录 - $data['content_backup_list'] = $this->Logs_model->get_backup_list($is_id); - - //所属导航栏目 - $data['setting_website_nav'] = $this->InfoMetas_model->get_list(0, 'setting_website_nav_' . strtolower($this->config->item('site_code'))); - - $data['my_tags'] = array(); - $data['all_tags'] = array(); - if (is_series_site()) { - //信息标签 - $this->InfoTags_model->ic_id = null; - $data['all_tags'] = $this->InfoTags_model->list_tag(); - $this->InfoTags_model->ic_id = $data['information']->ic_id; - $data['my_tags'] = $this->InfoTags_model->list_tag(); - //差集 - foreach ($data['all_tags'] as &$it) - { - foreach ($data['my_tags'] as $it2) - { - if ($it->it_id == $it2->icit_it_id) - { - $it = null; - break; - } - } - } - $data['all_tags'] = array_filter($data['all_tags']); - } - - $this->load->view('bootstrap3/header', $data); - $this->load->view('bootstrap3/information_edit'); - $this->load->view('bootstrap3/footer'); - } - - /** - public function redirect($jumpUrl){ - - header('HTTP/1.1 301 Moved Permanently'); - - header($jumpUrl);// 301 跳转到设置的 url - - exit(); - - } */ - public function test_proxy($url = false) { - $curl = curl_init(); - //curl_setopt($curl,CURLOPT_URL, "http://graph.facebook.com/?id=http://www.chinahighlights.com"); - //curl_setopt($curl,CURLOPT_URL, 'http://graph.facebook.com/?id=http://www.mybeijingchina.com/beijing-attractions/beihai-park/'); - curl_setopt($curl, CURLOPT_URL, $url); - curl_setopt($curl, CURLOPT_HEADER, 0); - curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); - curl_setopt($curl, CURLOPT_HTTPPROXYTUNNEL, 1); - curl_setopt($curl, CURLOPT_PROXY, "120.24.227.23:33333"); - $request = curl_exec($curl); - curl_close($curl); - return $request; - //echo $request; - } - - // 分享数 lzq - public function statistical_sharing() { - - //$info_ic = $this->Information_model->get_ic_url_by_code('mbj'); - $info_ic = $this->Information_model->get_ic_url(); - $ic_id = $info_ic->ic_id; - $ic_url = $info_ic->ic_url; - $ic_sitecode = $info_ic->ic_sitecode; - $site = $this->config->item('site'); - - if (!empty($ic_url)) { - - $result = $this->Information_model->update_ic_date_by_code($ic_id); - //var_dump($site['mbj']['site_url']); - //$wz_url = 'http://graph.facebook.com/?id='.$site['mbj']['site_url'].$ic_url; - $complete_url = 'http://graph.facebook.com/?id=' . $site[$ic_sitecode]['site_url'] . $ic_url; - //echo $wz_url; - $api_return = $this->test_proxy($complete_url); - $api_return = json_decode($api_return); - if (empty($api_return->shares)) { - var_dump($api_return); - $shares = 0; - } else { - var_dump($api_return); - $shares = $api_return->shares; - } - - //echo $asd->shares; - $result2 = $this->Information_model->insert_url_to_csi($info_ic->ic_url, $ic_id, $info_ic->ic_sitecode, $shares); - } - - //$sstt = $this->config->item('site'); - //foreach($infolist as $k=>$v){ - // $aabb[] = $v->ic_sitecode; - //} - //$url_count = $this->Information_model->get_count_by_code('mbj'); - //$surl = site_url('/information/fengxiangshu'); - //redirect($surl,'refresh',301); - - $this->load->view('bootstrap3/header'); - $this->load->view('bootstrap3/statistical_sharing'); - } - - public function edit_save() { - header('Cache-Control: no-cache'); - $information = $this->Information_model->Detail($this->input->post('is_id')); - if ($information === false) { - $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_notfound')); - echo json_encode($data); - return false; - } - - $this->form_validation->set_rules('ic_url_title', 'lang:ic_url_title', 'required'); - $this->form_validation->set_rules('ic_title', 'lang:ic_title', 'required'); - $this->form_validation->set_rules('ic_author', 'lang:ic_author', 'required'); - $this->form_validation->set_rules('ic_url', 'lang:ic_url', 'callback_ic_url_check'); - //这里比较特别，检测两次ic_url，ci会冲掉第一个ic_url的规则，所以需要在下面也加上callback_ic_url_check - $this->form_validation->set_rules('ic_url', 'lang:ic_url_format', 'callback_ic_url_check|callback_ic_url_format'); - - if ($this->input->post('ignore_seo_check') === false) { - $this->form_validation->set_rules('ic_seo_title', 'lang:ic_seo_title', 'required'); - $this->form_validation->set_rules('ic_seo_description', 'lang:ic_seo_description', 'required|max_length[250]'); - } - if ($this->form_validation->run() == FALSE) { - $data = array(); - foreach ($this->form_validation->_error_array as $key => $value) { - $data[] = array('name' => $key, 'value' => $value); - } - echo json_encode($data); - } else { - $this->InfoContents_model->Update($information->is_ic_id, $this->input->post('ic_url'), $this->input->post('ic_url_title'), $this->input->post('ic_type'), $this->input->post('ic_title'), $this->input->post('ic_content'), $this->input->post('ic_summary'), $this->input->post('ic_seo_title'), $this->input->post('ic_seo_description'), $this->input->post('ic_seo_keywords'), $this->input->post('ic_show_bread_crumbs'), $this->input->post('ic_status'), $this->input->post('ic_template'), $this->input->post('ic_photo'), $this->input->post('ic_photo_width'), $this->input->post('ic_photo_height'), $this->input->post('ic_recommend_tours'), $this->input->post('ic_recommend_packages'), $this->input->post('ic_ht_area_id'), $this->input->post('ic_ht_area_type'), $this->input->post('ic_ht_product_id'), $this->input->post('ic_ht_product_type'), $this->input->post('ic_author')); - - //收录查询,只在发布上线并且url不为空的时候检查 - $embody_url = $this->input->post('ic_url'); - $embody_url = trim($embody_url); - if ($this->input->post('ic_status') == 1 && $embody_url != '') { - $embody = $this->InfoMetas_model->get($information->is_ic_id, 'meta_embody'); - if (empty($embody)) { - $times = date('Y-m-d H:i:s'); - $this->InfoMetas_model->add($information->is_ic_id, 'meta_embody', $times); - } - } - - //为新闻添加默认发布时间 - //if($information->ic_ht_area_type=='s' || $information->ic_type=='c_article') - //{ - $meta_news_createdate = get_meta($information->ic_id, 'meta_news_createdate'); - if (empty($meta_news_createdate)) { - add_meta($information->ic_id, 'meta_news_createdate', date('m/d/Y', time())); - } - //} - // if (is_series_site()) { - //如果URL有修改也删除静态文件 - if ($this->input->post('ic_url') != $information->ic_url) { - $this->update_cache($information->ic_url, true); - } - - //如果信息不发布则删除静态文件 - if ($this->input->post('ic_status') == '0') { - $this->update_cache($this->input->post('ic_url'), true); - } - - - //德语站FAQ版块需要删除原来的文件才能更新静态 - $site_code = $this->config->item('site_code'); - $ic_url = $this->input->post('ic_url'); - $auto_update_cache = $this->input->get_post('auto_update_cache_checkbox'); - if ($site_code == 'gm' && substr($ic_url, 0, 5) == '/faq/') { - $update_info_log = $this->update_cache($ic_url, true); - } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { - $update_info_log = $this->update_cache($ic_url); - } else if (strcasecmp($site_code, "cht") != 0) {//非cht站点 - $update_info_log = $this->update_cache($ic_url); - } - - if (empty($update_info_log) || count($update_info_log) == 0 || !isset($update_info_log[0]['url'])) { - $update_info_log = 'not found update info log'; - } - - $data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success'), 'update_info_log' => $update_info_log); - $this->Logs_model->backup($information->is_id, $this->input->post('ic_content')); - $this->Logs_model->backup_summary($information->is_id, $this->input->post('ic_summary')); - - //作者个人页面更新 - if ($this->config->item('site_code') == 'cht') { - $author_pages = array( - 'zzy' => 'http://www.chinahighlights.com/author/ruru-zhou/', - 'Gavin' => 'http://www.chinahighlights.com/author/gavin-van-hinsbergh/', - 'WBL' => 'http://www.chinahighlights.com/author/annie-wu/', - 'PKL' => 'http://www.chinahighlights.com/author/kelly/', - '210000017' => 'http://www.chinahighlights.com/author/lynne-buddin/', - '202000027' => 'http://www.chinahighlights.com/author/margaux/', - '202000019' => 'http://www.chinahighlights.com/author/anusuya-mitra/', - '210000018' => 'http://www.chinahighlights.com/author/connie/', - '210000016' => 'http://www.chinahighlights.com/author/ben/', - '200000008' => 'http://www.chinahighlights.com/author/pete-marchetto/', - '210000019' => 'http://www.chinahighlights.com/author/oscar/', - '210000021' => 'http://www.chinahighlights.com/author/matthew/', - '200000013' => 'http://www.chinahighlights.com/author/kit-onslow-smith/', - '202000018' => 'http://www.chinahighlights.com/author/klaus-capra/', - '202000017' => 'http://www.chinahighlights.com/author/christy-campbell/' - ); - $key = $this->input->post('ic_author'); - if (isset($author_pages[$key])) { - $this->update_cache($author_pages[$key]); - } - } - - echo json_encode($data); - } - } - - //URL不重复检查 - function ic_url_check() { - if ($this->input->post('ignore_url_check')) { - return true; - } - - $url = $this->input->post('ic_url'); - if ($url === '') { - return true; - } - $is_id = $this->input->post('is_id'); - return $this->Information_model->URLcheck($is_id, $url); - } - - //URL格式检查，不能包含大小写、空格等特殊字符 - function ic_url_format($url) { - if ($url != mb_strtolower($url) || strpos($url, ' ') !== false || strpos($url, '--') !== false || strpos($url, ')') !== false || strpos($url, '(') !== false || strpos($url, '//') !== false || strpos($url, '\\') !== false) { - return false; - } - return true; - } - - //更新静态文件 - //不用参数提交的原因是可能url带有特殊字符，CI会报错 - public function update_cache($static_html_url = false, $delete_only = false) { - $url = !empty($static_html_url) ? $static_html_url : $this->input->post('cache_url'); - $url = str_replace($this->config->item('site_url'), '', $url); - $original_url = $url; //原始链接 - $delete_only = !empty($delete_only) ? $delete_only : $this->input->get_post('delete_only'); - - switch ($this->config->item('site_code')) { - case 'cht': - $search_list = $this->Information_model->search_url($url); - $amp_request = FALSE; - foreach ($search_list as $key => $req_url) { - $meta_amp_status = get_meta($req_url->ic_id, 'AMP_STATUS'); - if ($meta_amp_status) { - $amp_request = TRUE; - } - } - if ($amp_request) { - $url = 'http://184.172.113.219:22224/amp' . $url; - } else { - $url = 'http://184.172.113.219:22224' . $url; - } - break; - case 'ah': - if ($delete_only === true) { - $url = 'https://www.asiahighlights.com/index.php/information/delete_cache_8X913mksJ/?static_html_url=' . $url; - } else {// static_html_optimize=comeon 启用静态化压缩和js、css延迟加载 - $url = 'https://www.asiahighlights.com/index.php/information/detail/?static_html_url=' . $url . '&static_html_optimize=comeon'; - } - break; - - case 'gm': - GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 - if ($delete_only) { - $url = "http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url); - } else { - //先删除再生成，部分页面没有在信息平台中 - GET_HTTP("http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url)); - $url = "http://144.76.185.44:8029" . $url; - } - break; - - case 'vac'://国际站 - case 'vc': - case 'it': - case 'ru': - case 'jp': - if ($delete_only) { - //只删除操作，在url修改和不发布信息的时候使用 - $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; - } else { - $information = $this->Information_model->Detail($url); - $tmp = $url; - //判断是否是更新信息 - // 产品页面不能生成静态页面，比如/beijing/hotel/只是为了在导航显示一个链接，如果生成了静态页面，网前只会显示一个空白页面了 - if (!empty($information->ic_content)) { - $url = $this->config->item('site_url') . '/index.php/information/detail/?static_html_url=' . $url; - } else { - //先尝试删除静态文件。 - $try_del = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; - file_get_contents($try_del); - $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $url; - } - if (isset($information->ic_type) && $information->ic_type == 'product') { - $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $tmp; - } - } - break; - - case 'ct'://子站点使用 - case 'sht': - case 'gl': - case 'mbj': - case 'yz': - $url = $this->config->item('site_url') . $url . '@cache@refresh'; - break; - default:return false; - break; - } - - //关闭错误提示，防止file_get_contents请求特殊字符的时候会报错或者404、500,特殊字符需要用urlencode编码第一个/后面的url - //error_reporting(NULL); - //ini_set('display_errors', 'Off'); - - $content = GET_HTTP($url); - if ($content === false) { - $data[] = array('name' => 'no', 'value' => sprintf($this->lang->line('update_cache_failed'), $url)); - } else { - //手动更新的话，接着更新CDN缓存 - $msg = $this->lang->line('update_cache_success'); - - if ($this->input->post('updatecdn') == 1) { - $notice = $this->update_cdn(); - if ($notice == 200) { - $msg.=$this->lang->line('update_cdn_success'); - } else { - $msg.=$this->lang->line('update_cdn_failed') . '
' . $notice; - } - } - $data[] = array('name' => 'ok', 'value' => $msg, 'url' => $url); - } - //如果是外部调用就返回结果，内部就不返回了 - if ($this->input->post('cache_url')) { - echo json_encode($data); - } - return $data; - } - - //更新CDN缓存 - public function update_cdn($static_html_url = false) { - $flag = false; //false：不更新，true：更新 - $update_site = array('jp', 'ru'); //需要更新CDN的站点 - //需要更新的url - $url = $static_html_url; - if (empty($url)) - $url = $this->input->post('cache_url'); - - //如果传递进来的url是带有域名，则对域名进行判断 - $tempu = parse_url($url); - if (isset($tempu['host'])) { - $url = isset($tempu['path']) ? $tempu['path'] : '/'; - $pad = $tempu['host']; - $flag = true; - } - //如果传递进来的url没有域名，则使用当前站点的信息进行判断 - else { - $url = str_replace($this->config->item('site_url'), '', $url); - $pad = str_replace('http://', '', $this->config->item('site_url')); - if (in_array($this->config->item('site_code'), $update_site)) - $flag = TRUE; - } - - //默认更新成功，如果不成功，则返回错误提示信息 - $notice = 200; - if ($flag) { - $result = GET_HTTP('https://openapi.us.cdnetworks.com/purge/rest/doPurge?user=ycc@chinahighlights.com&pass=cXi2UbsTrw9Urv@&pad=' . $pad . '&type=item&path=' . $url . '&output=json'); - $result = json_decode($result, true); - if ($result['resultCode'] != 200) - $notice = $result['notice'] . $result['details']; - } - return $notice; - } - - //获取产品信息，提供给用户选择进行绑定 - function get_products() { - $HT_productType = $this->input->post('product_type'); - $HT_productName = $this->input->post('product_name'); - //产品类型 - switch ($HT_productType) { - case 't': - $data['productList'] = $this->Landscape_model->search_list($HT_productName); - break; - default: - $data['productList'] = array(); - break; - } - $data['product_type'] = $HT_productType; - $product_list_page = $this->load->view('bootstrap/information_select_product', $data, true); - $data = array(); - $data[] = array('name' => 'ok', 'value' => $product_list_page); - echo json_encode($data); - return true; - } - - //显示备份的内容 - function backup_content($log_id) { - $data['log_info'] = $this->Logs_model->read($log_id); - $data['log_list'] = $this->Logs_model->get_all_backup_list($data['log_info']->log_res_id); - $this->load->view('bootstrap/header', $data); - $this->load->view('bootstrap/information_backup_content'); - $this->load->view('bootstrap/footer'); - } - - //增加新景点到景点概述下 - //先找到当前城市的景点概述根节点，然后新增加 - //$lsi_sn 翰特景点id - function add_landscape($area_id, $lsi_sn) { - //获取景点概述节点 - $root_landscape = $this->Information_model->get_type_detail('c_attraction', 'c', $area_id); - - if ($root_landscape == FALSE) { - $data[] = array('name' => 'no', 'value' => $this->lang->line('root_landscape_notfound')); - echo json_encode($data); - return false; - } - - //获取景点详细内容 - $Landscape = $this->Landscape_model->get_detail($lsi_sn); - if ($root_landscape == FALSE) { - $data[] = array('name' => 'no', 'value' => $this->lang->line('landscape_notfound')); - echo json_encode($data); - return false; - } - - - //添加空内容 - $this->InfoContents_model->Add($Landscape->LSI2_Name, $Landscape->LSI2_Name, '', $Landscape->LSI2_Name, $Landscape->LSI2_ShortIntro, '', '', '', '', 0, 0, '', '', 0, 0, '', '', $area_id, 'c', $lsi_sn, 't', ''); - if ($this->InfoStructures_model->Add($root_landscape->is_id, $this->InfoContents_model->insert_id)) { - $data[] = array('name' => 'ok', 'value' => site_url('information/edit/' . $this->InfoStructures_model->insert_id)); - } else { - $data[] = array('name' => 'no', 'value' => $this->lang->line('form_info_error')); - } - echo json_encode($data); - $this->Logs_model->add($this->InfoStructures_model->insert_id); - return true; - } - - //保存自定义配置 - function save_meta() { - $im_ic_id = $this->input->post('im_ic_id'); - $im_key = $this->input->post('im_key'); - $im_value = $this->input->post('im_value'); - if ($im_ic_id && $im_key && $im_value !== false) { - $meta = $this->InfoMetas_model->get($im_ic_id, $im_key); - if ($meta === false) { - $this->InfoMetas_model->add($im_ic_id, $im_key, $im_value); - } else { - $this->InfoMetas_model->update($im_ic_id, $im_key, $im_value); - } - $data[] = array('name' => 'ok', 'value' => $this->lang->line('media_save_success')); - } else { - $data[] = array('name' => 'no', 'value' => $this->lang->line('media_save_error')); - } - echo json_encode($data); - return true; - } - - //保存自定义配置 - function delete_meta() { - $im_ic_id = $this->input->post('im_ic_id'); - $im_key = $this->input->post('im_key'); - if ($im_ic_id && $im_key) { - - $this->InfoMetas_model->delete($im_ic_id, $im_key); - $data[] = array('name' => 'ok', 'value' => $this->lang->line('media_delete_success')); - } else { - $data[] = array('name' => 'no', 'value' => $this->lang->line('media_save_error')); - } - echo json_encode($data); - return true; - } - -} +permission->is_admin(); + //$this->output->enable_profiler(TRUE); + $this->load->model('Area_model'); + $this->load->model('Information_model'); + $this->load->model('InfoContents_model'); + $this->load->model('InfoStructures_model'); + $this->load->model('Landscape_model'); + $this->load->model('Operator_model'); + $this->load->model('Logs_model'); + $this->load->model('InfoMetas_model'); + $this->load->model('Infoauthors_model'); + $this->load->model('InfoSMS_model'); + $this->load->library('Amplib'); //加载AMP处理类 + } + + public function index() { + echo '信息首页'; + } + + public function add($is_parent_id) { + //添加空内容. + $this->InfoContents_model->Add('', 'New Information', '', '', '', '', '', '', '', 0, 0, '', '', 0, 0, '', '', 0, '', 0, '', ''); + $infocontent = $this->InfoContents_model->get_ic_contents($this->InfoContents_model->insert_id); + if (!empty($infocontent) && $this->InfoStructures_model->Add($is_parent_id, $this->InfoContents_model->insert_id)) { + $is_id = $this->InfoStructures_model->insert_id; + $InfoStructures = $this->InfoStructures_model->Detail($is_id); + $InfoStructures->is_id = $is_id; + $data[] = array('name' => 'ok', 'value' => $InfoStructures); + $this->Logs_model->add($this->InfoStructures_model->insert_id); + } else { + $data[] = array('name' => 'no', 'value' => $this->lang->line('form_info_error')); + } + echo json_encode($data); + return TRUE; + } + + //移动结构顺序 + public function move() { + //网站会提交一个同级节点id列表字符串，按照这个去排序 + $parent_id = $this->input->post('pid'); + $idsStr = $this->input->post('ids'); + $idsArray = explode(',', $idsStr); + foreach ($idsArray as $key => $value) { + if ($value) { + //设置排序 + $this->InfoStructures_model->set_sort($value, $key); + //设置path + $this->InfoStructures_model->set_path($parent_id, $value); + } + } + $data[] = array('name' => 'ok', 'value' => $this->lang->line('structures_success_move')); + echo json_encode($data); + $this->Logs_model->move($idsStr); + return TRUE; + } + + //把文章移动到任意板块文章下 + //is_id 信息结构ID，is_parent_id即将转移到的信息结构id + public function move_by_is_id() { + $data = array(); + $is_id = $this->input->post('is_id'); + $is_parent_id = $this->input->post('is_parent_id'); + if ($is_id == $is_parent_id || empty($is_id) || empty($is_parent_id)) { + return false; + } + //即将移动到文章结构信息 + $Structure = $this->InfoStructures_model->Detail($is_id); + //目标文章结构信息 + $Structure_parent = $this->InfoStructures_model->Detail($is_parent_id); + //只能移动到本站点下 + if ($Structure->is_sitecode == $Structure_parent->is_sitecode) { + //不能搬迁到自己的子节点下 + if (strpos(',' . $Structure_parent->is_path, ',' . $is_id . ',') == false) { + $this->InfoStructures_model->set_path($is_parent_id, $is_id); + } + //信息的区域类型和id也要修改 todo + } + $data[] = array('name' => 'ok', 'value' => $this->lang->line('structures_success_move')); + echo json_encode($data); + $this->Logs_model->move($is_id); + return TRUE; + } + + public function delete($is_id) { + //查询结构信息 + $Structure = $this->InfoStructures_model->Detail($is_id); + if ($Structure == FALSE) { + $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_notfound')); + echo json_encode($data); + return false; + } + if ($this->InfoStructures_model->HasChild($Structure->is_id)) { + $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_haschild')); + echo json_encode($data); + return false; + } else { + $info_detail = $this->Information_model->Detail($is_id); + $this->Logs_model->delete($is_id, $info_detail->ic_content); + if (!empty($info_detail->ic_summary)) { + $this->Logs_model->backup_summary($is_id, $info_detail->ic_summary); + } + $this->InfoStructures_model->Delete($Structure->is_id); + $this->InfoContents_model->Delete($Structure->is_ic_id); + //如果是已经发布的页面，删除静态文件 + if ($info_detail->ic_status == 1) { + $this->update_cache($info_detail->ic_url, true); + } + //删除成功后返回一个上级链接给用户 + $drumpurl = site_url('information/edit/' . $Structure->is_parent_id); + if ($Structure->is_parent_id == 0) + $drumpurl = site_url('/'); + $data[] = array('name' => 'ok', 'value' => $drumpurl); + echo json_encode($data); + return true; + } + } + + public function edit($is_id) { + set_time_limit(30); + //$this->output->enable_profiler(true); + //查询结构信息 + $Structure = $this->InfoStructures_model->Detail($is_id); + if ($Structure == FALSE) { + show_404(); + } + //查询结构根节点 + $rootStructure = $this->InfoStructures_model->GetParent($Structure->is_path, 1); + //没有根节点就从它本身开始查询 + if ($rootStructure == false) { + $rootStructure_ID = $Structure->is_id; + } else { + $rootStructure_ID = $rootStructure->is_id; + } + + //查询结构列表信息 + $data['informationList'] = $this->Information_model->StructureList($rootStructure_ID); + + //增加一项，属于这个区域，但是结构数据层次不准确的也要列出来 + //todo: + //信息内容 + $data['information'] = $this->Information_model->Detail($is_id); + + //检查该信息是否已收录 + $data['embody'] = 1; + if (isset($data['information']->ic_id)) { + $embody = $this->InfoMetas_model->get($data['information']->ic_id, 'meta_embody'); + if ($embody && $embody != '1') { + $data['embody'] = 0; + } + //设置该信息所有未读消息为已读 + $this->InfoSMS_model->readed_for_info($data['information']->ic_id); + } + + //主节点信息 + $data['rootInformation'] = $this->Information_model->Detail($rootStructure_ID); + //获取未绑定的景点,只有城市有，无视其它区域类型 + $data['unlink_landscape_list'] = array(); + + //可选的展示模板 + if (in_array($this->config->item('site_code'), array('vac', 'vc', 'jp', 'ru', 'it'))) { + $this->config->set_item('templates', $this->config->item('templates_i')); + } + + if (in_array($this->config->item('site_code'), array('ah'))) { + $this->config->set_item('templates', $this->config->item('templates_ah')); + } + if (in_array($this->config->item('site_code'), array('pgr'))) { + $this->config->set_item('templates', $this->config->item('templates_pgr')); + } + if (in_array($this->config->item('site_code'), array('ts'))) { + $this->config->set_item('templates', $this->config->item('templates_ts')); + } + if (in_array($this->config->item('site_code'), array('cht'))) { + $this->config->set_item('templates', $this->config->item('templates_cht')); + } + if (in_array($this->config->item('site_code'), array('gm'))) { + $this->config->set_item('templates', $this->config->item('templates_gm')); + } + + + + if ($Structure->is_sitecode=='ct'){ + $data['infoTypeList'] = $this->config->item('InfoType_ct'); + }else { + + switch ($data['rootInformation']->ic_ht_area_type) { + case 'c': //城市 + $data['infoTypeList'] = $this->config->item('InfoType_city'); + $data['unlink_landscape_list'] = $this->Information_model->get_unlink_landscape_list($data['rootInformation']->ic_ht_area_id); + break; + case 'p'://省份 + $data['infoTypeList'] = $this->config->item('InfoType_province'); + break; + case 'n'://国家 + $data['infoTypeList'] = $this->config->item('InfoType_country'); + break; + case 't'://特殊区域 + $data['infoTypeList'] = $this->config->item('InfoType_special'); + break; + case 'e'://大洲 + $data['infoTypeList'] = array(); + break; + case 'z'://公民游 + $data['infoTypeList'] = $this->config->item('InfoType_citizen'); + break; + case 'v'://视频 + $data['infoTypeList'] = $this->config->item('InfoType_video'); + break; + case 'f'://节庆 + $data['infoTypeList'] = $this->config->item('InfoType_festival'); + break; + case 'pd'://产品管理 + $data['infoTypeList'] = $this->config->item('InfoType_product'); + //LMR 2016-7-14 + if (in_array($this->config->item('site_code'), array('vac', 'vc', 'jp', 'ru', 'it'))) { + $this->config->set_item('templates', $this->config->item('templates_product_i')); + } else { + $this->config->set_item('templates', $this->config->item('templates_product')); + } + break; + default: + $data['infoTypeList'] = array('不设置' => 'none'); + break; + } + } + + + + $data['templateList'] = $this->config->item('templates'); + //翰特产品类型 + $data['productTypeList'] = $this->config->item('ProductType_HT'); + //获取绑定的产品名称 + switch ($data['information']->ic_ht_product_type) { + case 't': + $data['product_title'] = $this->Landscape_model->get_landscape_title($data['information']->ic_ht_product_id); + break; + default: + $data['product_title'] = ''; + break; + } + //获取最后更新者信息 + $data['last_edit_info'] = $this->Logs_model->get_last_edit($is_id); + + //编辑列表 + $sites = $this->config->item('site'); + $data['editor_list'] = $this->Operator_model->get_site_user($this->config->item('site_code')); + //获取作者列表 + $data['author_list'] = $this->Infoauthors_model->get_site_user($this->config->item('site_code')); + + //获取备份信息记录 + $data['content_backup_list'] = $this->Logs_model->get_backup_list($is_id); + + //所属导航栏目 + $data['setting_website_nav'] = $this->InfoMetas_model->get_list(0, 'setting_website_nav_' . strtolower($this->config->item('site_code'))); + + $data['my_tags'] = array(); + $data['all_tags'] = array(); + if (is_series_site()) { + //信息标签 + //$this->InfoTags_model->ic_id = null; + //$data['all_tags'] = $this->InfoTags_model->list_tag(); + //$this->InfoTags_model->ic_id = $data['information']->ic_id; + //$data['my_tags'] = $this->InfoTags_model->list_tag(); + //差集 + foreach ($data['all_tags'] as &$it) { + foreach ($data['my_tags'] as $it2) { + if ($it->it_id == $it2->icit_it_id) { + $it = null; + break; + } + } + } + $data['all_tags'] = array_filter($data['all_tags']); + } + + $this->load->view('bootstrap3/header', $data); + $this->load->view('bootstrap3/information_edit'); + $this->load->view('bootstrap3/footer'); + } + + /** + public function redirect($jumpUrl){ + + header('HTTP/1.1 301 Moved Permanently'); + + header($jumpUrl);// 301 跳转到设置的 url + + exit(); + + } */ + public function test_proxy($url = false) { + $curl = curl_init(); + //curl_setopt($curl,CURLOPT_URL, "http://graph.facebook.com/?id=http://www.chinahighlights.com"); + //curl_setopt($curl,CURLOPT_URL, 'http://graph.facebook.com/?id=http://www.mybeijingchina.com/beijing-attractions/beihai-park/'); + curl_setopt($curl, CURLOPT_URL, $url); + curl_setopt($curl, CURLOPT_HEADER, 0); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($curl, CURLOPT_HTTPPROXYTUNNEL, 1); + curl_setopt($curl, CURLOPT_PROXY, "120.24.227.23:33333"); + $request = curl_exec($curl); + curl_close($curl); + return $request; + //echo $request; + } + + // 分享数 lzq + public function statistical_sharing() { + + //$info_ic = $this->Information_model->get_ic_url_by_code('mbj'); + $info_ic = $this->Information_model->get_ic_url(); + $ic_id = $info_ic->ic_id; + $ic_url = $info_ic->ic_url; + $ic_sitecode = $info_ic->ic_sitecode; + $site = $this->config->item('site'); + + if (!empty($ic_url)) { + + $result = $this->Information_model->update_ic_date_by_code($ic_id); + //var_dump($site['mbj']['site_url']); + //$wz_url = 'http://graph.facebook.com/?id='.$site['mbj']['site_url'].$ic_url; + $complete_url = 'http://graph.facebook.com/?id=' . $site[$ic_sitecode]['site_url'] . $ic_url; + //echo $wz_url; + $api_return = $this->test_proxy($complete_url); + $api_return = json_decode($api_return); + if (empty($api_return->shares)) { + var_dump($api_return); + $shares = 0; + } else { + var_dump($api_return); + $shares = $api_return->shares; + } + + //echo $asd->shares; + $result2 = $this->Information_model->insert_url_to_csi($info_ic->ic_url, $ic_id, $info_ic->ic_sitecode, $shares); + } + + //$sstt = $this->config->item('site'); + //foreach($infolist as $k=>$v){ + // $aabb[] = $v->ic_sitecode; + //} + //$url_count = $this->Information_model->get_count_by_code('mbj'); + //$surl = site_url('/information/fengxiangshu'); + //redirect($surl,'refresh',301); + + $this->load->view('bootstrap3/header'); + $this->load->view('bootstrap3/statistical_sharing'); + } + + public function edit_save() { + header('Cache-Control: no-cache'); + $information = $this->Information_model->Detail($this->input->post('is_id')); + if ($information === false) { + $data[] = array('name' => 'no', 'value' => $this->lang->line('structures_error_notfound')); + echo json_encode($data); + return false; + } + + $this->form_validation->set_rules('ic_url_title', 'lang:ic_url_title', 'required'); + $this->form_validation->set_rules('ic_title', 'lang:ic_title', 'required'); + $this->form_validation->set_rules('ic_author', 'lang:ic_author', 'required'); + $this->form_validation->set_rules('ic_url', 'lang:ic_url', 'callback_ic_url_check'); + //这里比较特别，检测两次ic_url，ci会冲掉第一个ic_url的规则，所以需要在下面也加上callback_ic_url_check + $this->form_validation->set_rules('ic_url', 'lang:ic_url_format', 'callback_ic_url_check|callback_ic_url_format'); + + if ($this->input->post('ignore_seo_check') === false) { + $this->form_validation->set_rules('ic_seo_title', 'lang:ic_seo_title', 'required'); + $this->form_validation->set_rules('ic_seo_description', 'lang:ic_seo_description', 'required|max_length[250]'); + } + if ($this->form_validation->run() == FALSE) { + $data = array(); + foreach ($this->form_validation->_error_array as $key => $value) { + $data[] = array('name' => $key, 'value' => $value); + } + echo json_encode($data); + } else { + $this->InfoContents_model->Update($information->is_ic_id, $this->input->post('ic_url'), $this->input->post('ic_url_title'), $this->input->post('ic_type'), $this->input->post('ic_title'), $this->input->post('ic_content'), $this->input->post('ic_summary'), $this->input->post('ic_seo_title'), $this->input->post('ic_seo_description'), $this->input->post('ic_seo_keywords'), $this->input->post('ic_show_bread_crumbs'), $this->input->post('ic_status'), $this->input->post('ic_template'), $this->input->post('ic_photo'), $this->input->post('ic_photo_width'), $this->input->post('ic_photo_height'), $this->input->post('ic_recommend_tours'), $this->input->post('ic_recommend_packages'), $this->input->post('ic_ht_area_id'), $this->input->post('ic_ht_area_type'), $this->input->post('ic_ht_product_id'), $this->input->post('ic_ht_product_type'), $this->input->post('ic_author')); + + //AMP更新和生成 beign + $auto_update_amp = $this->input->get_post('auto_update_amp'); + if (!empty($auto_update_amp) && $auto_update_amp == 'true' && $this->input->post('ic_status') == 1) { + $amp_result=$this->amplib->auto_create($information->ic_id); + if (!empty($amp_result)) { + $amp_result = json_decode($amp_result); + if($amp_result->result=='ok'){ + $amp_save_result= $this->amplib->edit_save($information->ic_id,$amp_result->data->amp,'1'); + if(!empty($amp_save_result)){ + $amp_save_result = json_decode($amp_save_result); + if($amp_save_result->name=='no'){ + echo json_encode(array('name' => 'no', 'value' => 'AMP转换语法错误，请重新进入AMP编辑器检查')); + return; + } + } + } + } + } + //AMP更新和生成 end + //为新闻添加默认发布时间 + $meta_news_createdate = get_meta($information->ic_id, 'meta_news_createdate'); + if (empty($meta_news_createdate)) { + add_meta($information->ic_id, 'meta_news_createdate', date('m/d/Y', time())); + } + + //如果URL有修改也删除静态文件 + if ($this->input->post('ic_url') != $information->ic_url) { + $this->update_cache($information->ic_url, true); + } + + //如果信息不发布则删除静态文件 + if ($this->input->post('ic_status') == '0') { + $this->update_cache($this->input->post('ic_url'), true); + } + + //德语站FAQ版块需要删除原来的文件才能更新静态 + $site_code = $this->config->item('site_code'); + $ic_url = $this->input->post('ic_url'); + $auto_update_cache = $this->input->get_post('auto_update_cache_checkbox'); + + if (strcasecmp($site_code, "gm") == 0 && !empty($auto_update_cache)) { + $update_info_log = $this->update_cache($ic_url, true); + } else if (strcasecmp($site_code, "cht") == 0 && !empty($auto_update_cache)) { + $update_info_log = $this->update_cache($ic_url); + } else if (strcasecmp($site_code, "cht") != 0 && strcasecmp($site_code, "gm") != 0) {//非cht站点并且非GM + $update_info_log = $this->update_cache($ic_url); + } + + if (empty($update_info_log) || count($update_info_log) == 0 || !isset($update_info_log[0]['url'])) { + $update_info_log = 'not found update info log'; + } + + $data[] = array('name' => 'ok', 'value' => $this->lang->line('form_info_success'), 'update_info_log' => $update_info_log); + $this->Logs_model->backup($information->is_id, $this->input->post('ic_content')); + $this->Logs_model->backup_summary($information->is_id, $this->input->post('ic_summary')); + + //作者个人页面更新 + if ($this->config->item('site_code') == 'cht') { + $author_pages = array( + 'zzy' => 'http://www.chinahighlights.com/author/ruru-zhou/', + 'Gavin' => 'http://www.chinahighlights.com/author/gavin-van-hinsbergh/', + 'WBL' => 'http://www.chinahighlights.com/author/annie-wu/', + 'PKL' => 'http://www.chinahighlights.com/author/kelly/', + '210000017' => 'http://www.chinahighlights.com/author/lynne-buddin/', + '202000027' => 'http://www.chinahighlights.com/author/margaux/', + '202000019' => 'http://www.chinahighlights.com/author/anusuya-mitra/', + '210000018' => 'http://www.chinahighlights.com/author/connie/', + '210000016' => 'http://www.chinahighlights.com/author/ben/', + '200000008' => 'http://www.chinahighlights.com/author/pete-marchetto/', + '210000019' => 'http://www.chinahighlights.com/author/oscar/', + '210000021' => 'http://www.chinahighlights.com/author/matthew/', + '200000013' => 'http://www.chinahighlights.com/author/kit-onslow-smith/', + '202000018' => 'http://www.chinahighlights.com/author/klaus-capra/', + '202000017' => 'http://www.chinahighlights.com/author/christy-campbell/' + ); + $key = $this->input->post('ic_author'); + if (isset($author_pages[$key])) { + $this->update_cache($author_pages[$key]); + } + } + + echo json_encode($data); + } + } + + //URL不重复检查 + function ic_url_check() { + if ($this->input->post('ignore_url_check')) { + return true; + } + + $url = $this->input->post('ic_url'); + if ($url === '') { + return true; + } + $is_id = $this->input->post('is_id'); + return $this->Information_model->URLcheck($is_id, $url); + } + + //URL格式检查，不能包含大小写、空格等特殊字符 + function ic_url_format($url) { + if ($url != mb_strtolower($url) || strpos($url, ' ') !== false || strpos($url, '--') !== false || strpos($url, ')') !== false || strpos($url, '(') !== false || strpos($url, '//') !== false || strpos($url, '\\') !== false) { + return false; + } + return true; + } + + //更新静态文件 + //不用参数提交的原因是可能url带有特殊字符，CI会报错 + public function update_cache($static_html_url = false, $delete_only = false) { + $url = !empty($static_html_url) ? $static_html_url : $this->input->post('cache_url'); + $url = str_replace($this->config->item('site_url'), '', $url); + $original_url = $url; //原始链接 + $delete_only = !empty($delete_only) ? $delete_only : $this->input->get_post('delete_only'); + + switch ($this->config->item('site_code')) { + case 'cht': + $search_list = $this->Information_model->search_url($url); + $amp_request = FALSE; + foreach ($search_list as $key => $req_url) { + $meta_amp_status = get_meta($req_url->ic_id, 'AMP_STATUS'); + if ($meta_amp_status) { + $amp_request = TRUE; + } + } + if ($amp_request) { + $url = 'http://192.155.250.124:22224/ampreq' . $url; + } else { + $url = 'http://192.155.250.124:22224' . $url; + } + break; + case 'ah': + if ($delete_only === true) { + $url = 'https://www.asiahighlights.com/index.php/information/delete_cache_8X913mksJ/?static_html_url=' . $url; + } else {// static_html_optimize=comeon 启用静态化压缩和js、css延迟加载 + $url = 'https://www.asiahighlights.com/index.php/information/detail/?static_html_url=' . $url . '&static_html_optimize=comeon'; + } + break; + + case 'gm': + //GET_HTTP("http://148.251.35.42:3300/create-cache/?url=" . urlencode($url)); //请求nodejs静态化更新页面，删除缓存，因为部分页面没有进入信息平台 + if ($delete_only) { + $url = "http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url); + } else { + //先删除再生成，部分页面没有在信息平台中 + GET_HTTP("http://144.76.185.44:8029/gm.php/information/delete_cache_23Xd913mddkgssODII?static_html_url=" . urlencode($url)); + $url = "http://144.76.185.44:8029" . $url; + } + break; + + case 'vac'://国际站 + case 'vc': + case 'it': + case 'ru': + case 'jp': + if ($delete_only) { + //只删除操作，在url修改和不发布信息的时候使用 + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; + } else { + $information = $this->Information_model->Detail($url); + $tmp = $url; + //判断是否是更新信息 + // 产品页面不能生成静态页面，比如/beijing/hotel/只是为了在导航显示一个链接，如果生成了静态页面，网前只会显示一个空白页面了 + if (!empty($information->ic_content)) { + $url = $this->config->item('site_url') . '/index.php/information/detail/?static_html_url=' . $url; + } else { + //先尝试删除静态文件。 + //$try_del = $this->config->item('site_url') . '/index.php/welcome/update_cache/delete_only?static_html_url=' . $url; + //file_get_contents($try_del); + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $url; + } + if (isset($information->ic_type) && $information->ic_type == 'product') { + $url = $this->config->item('site_url') . '/index.php/welcome/update_cache/?static_html_url=' . $tmp; + } + //int return direct + $cache_url = $this->input->post('cache_url'); + if ($url && !$cache_url) { + /* + ignore_user_abort(true); + $ch = curl_init(); + curl_setopt($ch, CURLOPT_URL, $url); + curl_setopt($ch, CURLOPT_TIMEOUT, 1); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); //禁止直接显示获取的内容 + curl_setopt($ch, CURLOPT_HEADER, 0); //不需要HEAD + curl_setopt($ch, CURLOPT_FRESH_CONNECT, 1); + curl_setopt($ch, CURLOPT_NOBODY, 1); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1); + curl_exec($ch); + curl_close($ch); + */ + $data['async_update'] = $url; + $data[] = array('name' => 'ok', 'value' => '信息保存成功，请在8秒后检查更新页面。', 'url' => $url); + //如果是外部调用就返回结果，内部就不返回了 + if ($cache_url) { + echo json_encode($data); + } + return $data; + } + } + break; + + case 'ct'://子站点使用 + case 'sht': + case 'gl': + case 'mbj': + case 'yz': + $url = $this->config->item('site_url') . $url . '@cache@refresh'; + break; + default:return false; + break; + } + + $content = GET_HTTP($url); + if ($content === false) { + $data[] = array('name' => 'no', 'value' => sprintf($this->lang->line('update_cache_failed'), $url)); + } else { + //手动更新的话，接着更新CDN缓存 + $msg = $this->lang->line('update_cache_success'); + + if ($this->input->post('updatecdn') == 1) { + $notice = $this->update_cdn(); + if ($notice == 200) { + $msg .= $this->lang->line('update_cdn_success'); + } else { + $msg .= $this->lang->line('update_cdn_failed') . '
' . $notice; + } + } + $data[] = array('name' => 'ok', 'value' => $msg, 'url' => $url); + } + //如果是外部调用就返回结果，内部就不返回了 + if ($this->input->post('cache_url')) { + echo json_encode($data); + } + return $data; + } + + //更新CDN缓存 + public function update_cdn($static_html_url = false) { + $flag = false; //false：不更新，true：更新 + $update_site = array('jp', 'ru'); //需要更新CDN的站点 + //需要更新的url + $url = $static_html_url; + if (empty($url)) + $url = $this->input->post('cache_url'); + + //如果传递进来的url是带有域名，则对域名进行判断 + $tempu = parse_url($url); + if (isset($tempu['host'])) { + $url = isset($tempu['path']) ? $tempu['path'] : '/'; + $pad = $tempu['host']; + $flag = true; + } + //如果传递进来的url没有域名，则使用当前站点的信息进行判断 + else { + $url = str_replace($this->config->item('site_url'), '', $url); + $pad = str_replace('http://', '', $this->config->item('site_url')); + if (in_array($this->config->item('site_code'), $update_site)) + $flag = TRUE; + } + + //默认更新成功，如果不成功，则返回错误提示信息 + $notice = 200; + if ($flag) { + $result = GET_HTTP('https://openapi.us.cdnetworks.com/purge/rest/doPurge?user=ycc@chinahighlights.com&pass=cXi2UbsTrw9Urv@&pad=' . $pad . '&type=item&path=' . $url . '&output=json'); + $result = json_decode($result, true); + if ($result['resultCode'] != 200) + $notice = $result['notice'] . $result['details']; + } + return $notice; + } + + //获取产品信息，提供给用户选择进行绑定 + function get_products() { + $HT_productType = $this->input->post('product_type'); + $HT_productName = $this->input->post('product_name'); + //产品类型 + switch ($HT_productType) { + case 't': + $data['productList'] = $this->Landscape_model->search_list($HT_productName); + break; + default: + $data['productList'] = array(); + break; + } + $data['product_type'] = $HT_productType; + $product_list_page = $this->load->view('bootstrap/information_select_product', $data, true); + $data = array(); + $data[] = array('name' => 'ok', 'value' => $product_list_page); + echo json_encode($data); + return true; + } + + //显示备份的内容 + function backup_content($log_id) { + $data['log_info'] = $this->Logs_model->read($log_id); + $data['log_list'] = $this->Logs_model->get_all_backup_list($data['log_info']->log_res_id); + $this->load->view('bootstrap/header', $data); + $this->load->view('bootstrap/information_backup_content'); + $this->load->view('bootstrap/footer'); + } + + //保存自定义配置 + function save_meta() { + $im_ic_id = $this->input->post('im_ic_id'); + $im_key = $this->input->post('im_key'); + $im_value = $this->input->post('im_value'); + if ($im_ic_id && $im_key && $im_value !== false) { + $meta = $this->InfoMetas_model->get($im_ic_id, $im_key); + if ($meta === false) { + $this->InfoMetas_model->add($im_ic_id, $im_key, $im_value); + } else { + $this->InfoMetas_model->update($im_ic_id, $im_key, $im_value); + } + $data[] = array('name' => 'ok', 'value' => $this->lang->line('media_save_success')); + } else { + $data[] = array('name' => 'no', 'value' => $this->lang->line('media_save_error')); + } + echo json_encode($data); + return true; + } + + //保存自定义配置 + function delete_meta() { + $im_ic_id = $this->input->post('im_ic_id'); + $im_key = $this->input->post('im_key'); + if ($im_ic_id && $im_key) { + + $this->InfoMetas_model->delete($im_ic_id, $im_key); + $data[] = array('name' => 'ok', 'value' => $this->lang->line('media_delete_success')); + } else { + $data[] = array('name' => 'no', 'value' => $this->lang->line('media_save_error')); + } + echo json_encode($data); + return true; + } + +} diff --git a/application/controllers/keyworlds.php b/application/controllers/keyworlds.php index 472f0b9b..ae82e562 100644 --- a/application/controllers/keyworlds.php +++ b/application/controllers/keyworlds.php @@ -15,9 +15,6 @@ class Keyworlds extends CI_Controller { } public function index($kw_is_id = '') { - $this->load->library('Accesscheck'); - $this->accesscheck->check_access(); - $this->permission->is_admin(); //查询结构列表信息 $data['keyworldsList'] = $this->Keywords_model->get_structure_list(); diff --git a/application/controllers/login.php b/application/controllers/login.php index 9f6c418f..4c0d5011 100644 --- a/application/controllers/login.php +++ b/application/controllers/login.php @@ -61,10 +61,6 @@ class Login extends CI_Controller { $admin_info = $this->session->userdata('session_admin'); if ($this->accesscheck->check_access($site_code)) { $this->session->set_userdata('session_site', $site_item); - $this->session->unset_userdata('access_module'); - $this->session->unset_userdata('access_read_list'); - $this->session->unset_userdata('access_write_list'); - $this->session->unset_userdata('access_sitecode'); } } //跳转到指定页面。 diff --git a/application/controllers/look_order.php b/application/controllers/look_order.php index 39aabc63..c85e926f 100644 --- a/application/controllers/look_order.php +++ b/application/controllers/look_order.php @@ -34,7 +34,9 @@ class Look_order extends CI_Controller { //显示订单数量，如果大于阈值就显示错误 public function status() { $data = array(); - $data['tour_count'] = $this->Orders_model->tour_count(); + $tour_count = $this->Orders_model->tour_count(); + $biz_count = $this->Orders_model->biz_count(); + $data['tour_count'] = $tour_count + $biz_count; if ($data['tour_count'] >= 550) { $this->output->set_status_header(500); } diff --git a/application/controllers/payment.php b/application/controllers/payment.php index 82a594ed..cdced964 100644 --- a/application/controllers/payment.php +++ b/application/controllers/payment.php @@ -16,8 +16,7 @@ class Payment extends CI_Controller { $data=array(); if ($this->input->post('price')) { - $data['payurl']=' - load->library('Accesscheck'); - $this->accesscheck->check_access(); //查询不到省份信息则显示错误 $data['province'] = $this->Area_model->get_province($province_id); if ($data['province'] == FALSE) diff --git a/application/controllers/seo.php b/application/controllers/seo.php index 74ac123b..ab0a152f 100644 --- a/application/controllers/seo.php +++ b/application/controllers/seo.php @@ -14,8 +14,6 @@ class Seo extends CI_Controller { $this->load->model('InfoContents_model'); $this->load->model('InfoStructures_model'); $this->load->model('InfoSEOs_model'); - $this->load->library('Accesscheck'); - $this->accesscheck->check_access(); } public function index() { diff --git a/application/controllers/tools.php b/application/controllers/tools.php index ac95ded2..12741419 100644 --- a/application/controllers/tools.php +++ b/application/controllers/tools.php @@ -11,6 +11,7 @@ class Tools extends CI_Controller $this->load->model('Area_model'); $this->load->model('InfoStructures_model'); $this->load->model('Information_model'); + $this->load->model('InfoMetas_model'); $this->site_code = $this->config->item('site_code'); } @@ -52,6 +53,29 @@ class Tools extends CI_Controller $this->load->view('tools/old', $data); } } + + /** + * + * 公有函数：AMP转化表格。 + * + * 必要参数： + * @param String $site_code + * + */ + public function amp_check() + { + $data['amp'] = $this->input->get_post('amp'); + if (!$data['amp']) $data['amp'] = 'yes'; + //AMP转化列表 + if ($data['amp'] == 'yes') { + $data['info'] = $this->InfoMetas_model->list_amp($this->site_code); + } else { + $data['info'] = $this->InfoMetas_model->list_no_amp($this->site_code); + } + + //视图 + $this->load->view('tools/amp_check', $data); + } /** * 导出CSV文件 diff --git a/application/controllers/welcome.php b/application/controllers/welcome.php index 214252b1..75659070 100644 --- a/application/controllers/welcome.php +++ b/application/controllers/welcome.php @@ -26,7 +26,7 @@ class Welcome extends CI_Controller { $data['last_city_list'] = $this->Area_model->get_last_edit_city(); if ($this->config->item('site_code') == 'pgr') { - $data['countryList'] = $this->Area_model->get_country_list_for_site("'589','645'"); + $data['countryList'] = $this->Area_model->get_country_list_for_site("'589','645','632','517','31','28','609','630','9','708','709'"); } $this->load->view('bootstrap/header', $data); @@ -65,29 +65,24 @@ class Welcome extends CI_Controller { $this->load->view('bootstrap/footer'); } - //获取所有信息+产品url - public function create_all_urls() { + //获取所有信息URL,用来批量静态化更新 + public function create_all_urls($view=false) { set_time_limit(0); $this->output->enable_profiler(false); - $this->Information_model->topNum = false; - $data['all_information'] = $this->Information_model->GetList('ic_status,ic_url,ic_sitecode'); - //系列站产品连接 - $site_code = strtoupper($this->config->item('site_code')); - if (!empty($site_code)) { - $this->load->helper('file'); - $path = APPPATH . '/views/product_urls/updateCache' . $site_code . '.txt'; - if (file_exists($path)) { - $data['product_urls'] = read_file($path); - $domain = $this->config->item('site_url'); - $data['product_urls'] = str_replace("\n", '
', $data['product_urls']); - $data['product_urls'] = str_replace($domain, $domain . '/index.php/welcome/update_cache/?static_html_url=', $data['product_urls']); - } + $data['all_information'] = $this->Information_model->GetList('ic_status,ic_id,ic_url,ic_sitecode,is_id'); + if ($view == 'amp') { + $this->load->view('bootstrap3/header', $data); + $this->load->view('bootstrap3/refresh_amp_urls'); + $this->load->view('bootstrap3/footer'); + } else { + $this->load->view('bootstrap/header', $data); + $this->load->view('bootstrap/cache_url', $data); + $this->load->view('bootstrap/footer'); } - $this->load->view('none_urls', $data); } //获取某个信息节点和子节点url - public function create_infomation_urls($is_parent_id) { + public function create_infomation_urls($is_parent_id, $view = false) { $this->output->enable_profiler(FALSE); $structure = $this->InfoStructures_model->Detail($is_parent_id); if (empty($structure)) { @@ -95,9 +90,15 @@ class Welcome extends CI_Controller { return false; } $data['all_information'] = $this->Information_model->get_list_by_path($structure->is_path); - $this->load->view('bootstrap/header', $data); - $this->load->view('bootstrap/cache_url', $data); - $this->load->view('bootstrap/footer'); + if ($view == 'amp') { + $this->load->view('bootstrap3/header', $data); + $this->load->view('bootstrap3/refresh_amp_urls'); + $this->load->view('bootstrap3/footer'); + } else { + $this->load->view('bootstrap/header', $data); + $this->load->view('bootstrap/cache_url', $data); + $this->load->view('bootstrap/footer'); + } } public function get_infomation_urls($is_parent_id) { @@ -118,37 +119,37 @@ class Welcome extends CI_Controller { $last_backup = $this->Logs_model->get_last_backup($info_id); if (empty($last_backup)) { $this->echo_json(array( - 'status' => 'error', - 'logId' => 0, - 'datetime' => 0, - 'username' => 0 - )); + 'status' => 'error', + 'logId' => 0, + 'datetime' => 0, + 'username' => 0 + )); } else { $this->echo_json(array( - 'status' => 'success', - 'logId' => $last_backup->log_id, - 'datetime' => $last_backup->log_datetime, - 'username' => $last_backup->log_ht_username - )); + 'status' => 'success', + 'logId' => $last_backup->log_id, + 'datetime' => $last_backup->log_datetime, + 'username' => $last_backup->log_ht_username + )); } } public function change_static_url($info_id) { $information = $this->Information_model->Detail($info_id); $htm_doc = new DOMDocument(); - $htm_doc->encoding='UTF-8'; + $htm_doc->encoding = 'UTF-8'; libxml_use_internal_errors(true); $htm_doc->strictErrorChecking = false; if (empty($information->ic_content)) { $this->echo_json(array( - 'status' => 'error', - 'infoId' => $info_id, - 'message' => 'info content is empty' - )); + 'status' => 'error', + 'infoId' => $info_id, + 'message' => 'info content is empty' + )); return; } $htm_doc->loadHTML( - mb_convert_encoding($information->ic_content, 'HTML-ENTITIES', 'UTF-8')); + mb_convert_encoding($information->ic_content, 'HTML-ENTITIES', 'UTF-8')); $htm_doc->normalizeDocument(); $img_list = $htm_doc->getElementsByTagName('img'); foreach ($img_list as $img) { @@ -157,87 +158,166 @@ class Welcome extends CI_Controller { $img->setAttribute('src', $img_src); } - $information->ic_content = $htm_doc->saveHTML(); - $this->InfoContents_model->Update( - $information->ic_id, - $information->ic_url, - $information->ic_url_title, - $information->ic_type, - $information->ic_title, - $information->ic_content, - $information->ic_summary, - $information->ic_seo_title, - $information->ic_seo_description, - $information->ic_seo_keywords, - $information->ic_show_bread_crumbs, - $information->ic_status, - $information->ic_template, - $information->ic_photo, - $information->ic_photo_width, - $information->ic_photo_height, - $information->ic_recommend_tours, - $information->ic_recommend_packages, - $information->ic_ht_area_id, - $information->ic_ht_area_type, - $information->ic_ht_product_id, - $information->ic_ht_product_type, - $information->ic_author); - - $this->echo_json(array( - 'status' => 'ok', - 'infoId' => $info_id, - 'message' => 'success', - 'date' => date('Y-m-d h:i:s') - )); + $anchor_list = $htm_doc->getElementsByTagName('a'); + foreach ($anchor_list as $anchor) { + $a_href = $anchor->getAttribute('href'); + echo 'a.href: ' . $a_href . '
'; + + $match_result = array(); + preg_match('/^http:\/\/www.chinahighlights.com(.*)/', $a_href, $match_result); + $result_count = count($match_result); + if ($result_count == 2) { + $result = '//www.chinahighlights.com' . $match_result[1]; + $anchor->setAttribute('href', $result); + echo $result . '
'; + } + } + + // $information->ic_content = $htm_doc->saveHTML(); + // $this->InfoContents_model->Update( + // $information->ic_id, + // $information->ic_url, + // $information->ic_url_title, + // $information->ic_type, + // $information->ic_title, + // $information->ic_content, + // $information->ic_summary, + // $information->ic_seo_title, + // $information->ic_seo_description, + // $information->ic_seo_keywords, + // $information->ic_show_bread_crumbs, + // $information->ic_status, + // $information->ic_template, + // $information->ic_photo, + // $information->ic_photo_width, + // $information->ic_photo_height, + // $information->ic_recommend_tours, + // $information->ic_recommend_packages, + // $information->ic_ht_area_id, + // $information->ic_ht_area_type, + // $information->ic_ht_product_id, + // $information->ic_ht_product_type, + // $information->ic_author); + // $this->echo_json(array( + // 'status' => 'ok', + // 'infoId' => $info_id, + // 'message' => 'success', + // 'date' => date('Y-m-d h:i:s') + // )); + } + + public function count_redirect_nofollow() { + $include_redirece_info = $this->Information_model->search_all_text('&t=78002', 2000); + echo 'redirect count: ' . count($include_redirece_info) . '
'; + $redirect_nofollow_list = array(); + $htm_doc = new DOMDocument(); + $htm_doc->encoding = 'UTF-8'; + libxml_use_internal_errors(true); + $htm_doc->strictErrorChecking = false; + foreach ($include_redirece_info as $info) { + $htm_doc->loadHTML( + mb_convert_encoding($info->ic_content, 'HTML-ENTITIES', 'UTF-8')); + $htm_doc->normalizeDocument(); + $anchor_list = $htm_doc->getElementsByTagName('a'); + foreach ($anchor_list as $anchor) { + $a_href = $anchor->getAttribute('href'); + $a_rel = $anchor->getAttribute('rel'); + + $match_result = array(); + preg_match('/.*&t=78002$/', $a_href, $match_result); + $result_count = count($match_result); + if ($result_count > 0 && $a_rel != 'nofollow') { + echo $info->ic_url . ' | ' . '(' . $info->ic_id . ',' . $info->is_id . ')' . '
'; + echo 'a.href: ' . $a_href . '; rel: ' . $a_rel . '
'; + $redirect_nofollow_list[] = $info; + } + } + } + echo 'nofollow_count: ' . count($redirect_nofollow_list) . '
'; + return $redirect_nofollow_list; + } + + public function transform_redirect_nofollow() { + $redirect_nofollow_list = $this->count_redirect_nofollow(); + $htm_doc = new DOMDocument(); + $htm_doc->encoding = 'UTF-8'; + libxml_use_internal_errors(true); + $htm_doc->strictErrorChecking = false; + + foreach ($redirect_nofollow_list as $info) { + $htm_doc->loadHTML( + mb_convert_encoding($info->ic_content, 'HTML-ENTITIES', 'UTF-8')); + $htm_doc->normalizeDocument(); + $anchor_list = $htm_doc->getElementsByTagName('a'); + foreach ($anchor_list as $anchor) { + $a_rel = $anchor->getAttribute('rel'); + $anchor->setAttribute('rel', 'nofollow'); + $this->Logs_model->backup($info->is_id, $info->ic_content); + $info->ic_content = $htm_doc->saveHTML(); + $this->InfoContents_model->Update( + $info->ic_id, $info->ic_url, $info->ic_url_title, $info->ic_type, $info->ic_title, $info->ic_content, $info->ic_summary, $info->ic_seo_title, $info->ic_seo_description, $info->ic_seo_keywords, $info->ic_show_bread_crumbs, $info->ic_status, $info->ic_template, $info->ic_photo, $info->ic_photo_width, $info->ic_photo_height, $info->ic_recommend_tours, $info->ic_recommend_packages, $info->ic_ht_area_id, $info->ic_ht_area_type, $info->ic_ht_product_id, $info->ic_ht_product_type, $info->ic_author); + } + } + + echo 'update_nofollow_count: ' . count($redirect_nofollow_list) . '
'; + } + + public function count_http_of_href() { + $data['all_information'] = $this->Information_model->search_all_text('http://www.chinahighlights.com/', 2000); + echo 'count: ' . count($data['all_information']) . '
'; + var_dump($data['all_information']); + } + + public function transform_href_to_https() { + $http_host = 'http://www.chinahighlights.com/'; + $https_host = 'https://www.chinahighlights.com/'; + $data['all_information'] = $this->Information_model->search_all_text($http_host, 200); + echo 'count: ' . count($data['all_information']) . '
'; + if (empty($data['all_information'])) { + echo 'nothing transform to https'; + } else { + foreach ($data['all_information'] as $item) { + + if (empty($item->ic_url)) { + echo '[' . $item->ic_title . '] [' . $item->ic_url . ']
'; + continue; + } else { + echo $item->ic_url . ' | ' . $item->ic_title . '
'; + } + + $this->Logs_model->backup($item->is_id, $item->ic_content); + $item->ic_content = str_replace($http_host, $https_host, $item->ic_content); + $this->InfoContents_model->Update( + $item->ic_id, $item->ic_url, $item->ic_url_title, $item->ic_type, $item->ic_title, $item->ic_content, $item->ic_summary, $item->ic_seo_title, $item->ic_seo_description, $item->ic_seo_keywords, $item->ic_show_bread_crumbs, $item->ic_status, $item->ic_template, $item->ic_photo, $item->ic_photo_width, $item->ic_photo_height, $item->ic_recommend_tours, $item->ic_recommend_packages, $item->ic_ht_area_id, $item->ic_ht_area_type, $item->ic_ht_product_id, $item->ic_ht_product_type, $item->ic_author + ); + } + } } private function echo_json($obj) { $this->output - ->set_content_type('application/json') - ->set_output(json_encode($obj)); + ->set_content_type('application/json') + ->set_output(json_encode($obj)); } - - //批量替换二级域名，如图片或者data域名 - function replace_hostname($topnum){ - $data=array(); - $find_host='http://data.chinarundreisen.com/'; //http://bilder.chinarundreisen.com/ - $new_host='//data.chinarundreisen.com/'; - $data['all_information'] = $this->Information_model->search_all_text($find_host,$topnum); - if($data['all_information']){ - foreach($data['all_information'] as $item){ - echo $item->ic_url.'
'; - $item->ic_content=str_replace($find_host, $new_host,$item->ic_content); - $this->InfoContents_model->Update( - $item->ic_id, - $item->ic_url, - $item->ic_url_title, - $item->ic_type, - $item->ic_title, - $item->ic_content, - $item->ic_summary, - $item->ic_seo_title, - $item->ic_seo_description, - $item->ic_seo_keywords, - $item->ic_show_bread_crumbs, - $item->ic_status, - $item->ic_template, - $item->ic_photo, - $item->ic_photo_width, - $item->ic_photo_height, - $item->ic_recommend_tours, - $item->ic_recommend_packages, - $item->ic_ht_area_id, - $item->ic_ht_area_type, - $item->ic_ht_product_id, - $item->ic_ht_product_type, - $item->ic_author - ); - } - }else{ - echo 'all done'; - } - } + //批量替换二级域名，如图片或者data域名 + function replace_hostname($topnum) { + $data = array(); + $find_host = 'http://data.chinarundreisen.com/'; //http://bilder.chinarundreisen.com/ + $new_host = '//data.chinarundreisen.com/'; + $data['all_information'] = $this->Information_model->search_all_text($find_host, $topnum); + if ($data['all_information']) { + foreach ($data['all_information'] as $item) { + echo $item->ic_url . '
'; + $item->ic_content = str_replace($find_host, $new_host, $item->ic_content); + $this->InfoContents_model->Update( + $item->ic_id, $item->ic_url, $item->ic_url_title, $item->ic_type, $item->ic_title, $item->ic_content, $item->ic_summary, $item->ic_seo_title, $item->ic_seo_description, $item->ic_seo_keywords, $item->ic_show_bread_crumbs, $item->ic_status, $item->ic_template, $item->ic_photo, $item->ic_photo_width, $item->ic_photo_height, $item->ic_recommend_tours, $item->ic_recommend_packages, $item->ic_ht_area_id, $item->ic_ht_area_type, $item->ic_ht_product_id, $item->ic_ht_product_type, $item->ic_author + ); + } + } else { + echo 'all done'; + } + } private function check_url($subject) { $result = $subject; @@ -261,7 +341,7 @@ class Welcome extends CI_Controller { preg_match($pattern, $subject, $match_result); $result_count = count($match_result); if ($result_count == 2) { - $result = $replace.$match_result[1]; + $result = $replace . $match_result[1]; } return $result; } @@ -282,7 +362,7 @@ class Welcome extends CI_Controller { $parent_path = str_replace('-', ',', $parent_path); $parent_path = trim($parent_path, ','); if ($parent_path != '') - $parent_path.=','; + $parent_path .= ','; $this->load->model('Import_model'); $this->Import_model->set_path($is_id, $parent_path); echo 'ok'; diff --git a/application/helpers/info_helper.php b/application/helpers/info_helper.php index 99909ace..06cb3f44 100644 --- a/application/helpers/info_helper.php +++ b/application/helpers/info_helper.php @@ -312,6 +312,11 @@ function get_content_by_url($url) { curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 $tmpInfo = curl_exec($curl); // 执行操作 + $httpCode = curl_getinfo($curl, CURLINFO_HTTP_CODE); + if($httpCode>=400){//页面状态，如果大于400说明页面打不开 + log_message('error', " curl {$httpCode} {$url} "); + return false; + } $errno = curl_errno($curl); if ($errno !== 0) { return false; diff --git a/application/libraries/Accesscheck.php b/application/libraries/Accesscheck.php index bb0a3fc0..8f9faebf 100644 --- a/application/libraries/Accesscheck.php +++ b/application/libraries/Accesscheck.php @@ -18,16 +18,9 @@ class Accesscheck extends CI_Controller return true; } - if ($this->session->userdata('access_module') === false){ - $this->init_accessdata(); - } + $this->session->set_userdata('access_sitecode', $this->Access_model->get_user_site_list($userdata['OPI_Code'])); //用户拥有权限de站点、模块&需要权限认证的模块 - $access_module = $this->session->userdata('access_module'); - $user_controller = $access_module['user_controller']; - $user_action = $access_module['user_action']; - $iaa_controller_list = $access_module['iaa_controller_list']; - $iaa_action_list = $access_module['iaa_action_list']; - $user_site_list = $this->session->userdata('access_sitecode'); + $user_site_list = $this->session->userdata('access_sitecode'); //检测用户是否能访问当前站点,如果不能，则跳转到该用户有权限的站点 if($site_code=='')$site_code=$this->config->item('site_code'); @@ -35,86 +28,9 @@ class Accesscheck extends CI_Controller header('Location: '.$_SERVER['HTTP_REFERER']); exit(); } - - //判断当前操作是否需要认证 - $flag=true; - if ($module!='') { - $module_array=explode('/', trim($module)); - $this->router->class= $module_array[0]; - $this->router->method= $module_array[1]; - } - //判断当前模块是否需要认证 - if (in_array($this->router->class, $iaa_controller_list)) { - //如果需要认证，判断是否有权限操作当前模块 - if (in_array($this->router->class,$user_controller)) { - //判断是否能编辑不同省份信息 - /*if($this->router->class=='province'){ - $province=str_replace('/province/', '', $this->uri->uri_string()); - $province=trim($province); - if (!isset($user_action[$this->router->class]) || !in_array($province, $user_action[$this->router->class])) { - $flag = false;//没有权限查看当前省份！ - } - } - //判断当前方法是否需要认证 - else*/ - if (isset($iaa_action_list[$this->router->class]) && in_array($this->router->method, $iaa_action_list[$this->router->class])) { - //如果当前方法需要认证，则判断是否有权限 - if (!isset($user_action[$this->router->class]) || !in_array($this->router->method, $user_action[$this->router->class])) { - $flag = false;//没有权限执行当前方法！ - } - } - }else { - $flag = false;//没有权限执行当前控制器模块！ - } - } - if ($module =='' && !$flag) { - redirect(site_url('Login/refuse')); - exit(); - } - return $flag; + return true; } - public function init_accessdata(){ - $userdata=$this->session->userdata('session_admin'); - //根据usercode获取用户角色、可读、可写列表 - $user_access=$this->Access_model->get_user_access($userdata['OPI_Code'],$this->config->item('site_code')); - //根据角色字符串获取用户有权限的操作 - $user_node=$this->Access_model->get_node_list($user_access->iao_role.'0'); - //把用户拥有的所有角色id组装成一个数组集合 - $node_str=''; - foreach ($user_node as $node) { - $node_str.=$node->ian_iaa_id; - } - $node_array=explode(',', substr($node_str, 0,-1)); - - //用户拥有权限de站点、模块&需要权限认证的模块 - $user_controller = array(); - $user_action = array(); - $iaa_controller_list = array(); - $iaa_action_list = array(); - - //所有需要认证的模块、方法 - $action_list=$this->Access_model->get_action_list(); - foreach ($action_list as $a) { - - //用户拥有的权限模块、方法 - if (in_array($a->iaa_id, $node_array) && $a->iaa_controller!='') { - $user_controller[] = $a->iaa_controller; - $user_action[$a->iaa_controller][] = $a->iaa_action; - } - //需要认证的控制器和方法 - if(!empty($a->iaa_controller))$iaa_controller_list[]=$a->iaa_controller; - if(!empty($a->iaa_action))$iaa_action_list[$a->iaa_controller][]=$a->iaa_action; - } - $access_module['user_controller'] = $user_controller; - $access_module['user_action'] = $user_action; - $access_module['iaa_controller_list'] = $iaa_controller_list; - $access_module['iaa_action_list'] = $iaa_action_list; - $this->session->set_userdata('access_read_list', $user_access->iao_read); - $this->session->set_userdata('access_write_list', $user_access->iao_write); - $this->session->set_userdata('access_sitecode', $this->Access_model->get_user_site_list($userdata['OPI_Code'])); - $this->session->set_userdata('access_module', $access_module); - } //获取角色等级(角色树形结构的等级) public function get_role_level($site_code='',$author=''){ diff --git a/application/libraries/Amplib.php b/application/libraries/Amplib.php new file mode 100644 index 00000000..59239abf --- /dev/null +++ b/application/libraries/Amplib.php @@ -0,0 +1,130 @@ +CI = & get_instance(); + $this->CI->load->model('Information_model'); + $this->CI->load->model('InfoMetas_model'); + $this->CI->load->model('Logs_model'); + } + + public function edit($ic_id) { + $data = array(); + $data['information'] = $this->CI->Information_model->detail_by_ic_id($ic_id); + if ($data['information'] == FALSE) { + show_404(); + } + $this->CI->load->view('bootstrap3/header', $data); + $this->CI->load->view('amp_editor'); + $this->CI->load->view('bootstrap3/footer'); + } + + public function auto_create($ic_id) { + $data = array(); + $data['information'] = $this->CI->Information_model->detail_by_ic_id($ic_id); + if ($data['information'] == FALSE) { + return json_encode(array('result' => 'no', 'data' => '找不到这个页面')); + } + + //144.76.185.44:8029 + //根据站点不同，配置不同参数 + $site_code = strtolower($this->CI->config->item('site_code')); + switch ($site_code) { + case 'ah': + //websitehost是表示资源下载的域名，在网页代码中有/css/xxx.css之类的路径，程序需要添加域名组成完整URL去下载文件，一般是data域名或者www域名 + $websitehost = 'https://data.asiahighlights.com'; + $html_source_url = 'https://www.asiahighlights.com/index.php/information/detail/?no_cache=true&static_html_url=' . $data['information']->ic_url; + break; + case 'cht': + $websitehost = 'https://data.chinahighlights.com'; + $html_source_url = 'http://192.155.224.195:2222' . $data['information']->ic_url; + break; + case 'gm': + $websitehost = 'https://data.chinarundreisen.com'; + $html_source_url = 'http://144.76.185.44:8029' . $data['information']->ic_url; + break; + case 'ct': + $websitehost = 'https://data.chinatravel.com'; + $html_source_url = 'http://158.85.210.78:2222' . $data['information']->ic_url; + break; + default: + $websitehost = $this->CI->config->item('site_url'); + $html_source_url = $this->CI->config->item('site_url') . $data['information']->ic_url; + } + //获取网页当前源码，然后发送到信息平台 + $html_source = GET_HTTP($html_source_url); + if (!empty($html_source)) { + $post_data = array('websitehost' => $websitehost, 'template_name' => $site_code, 'create_amp' => 'true', 'htmlsource' => $html_source); + //德语站点走另外一个控制器，其他站点还是走原来的流程 + if($site_code == 'gm'){ + return GET_HTTP(site_url('/apps/htmlcompressor/index_gm/choose_way'), $post_data, 'POST'); + }else{ + return GET_HTTP(site_url('/apps/htmlcompressor/index/optimize'), $post_data, 'POST'); + } + } + return json_encode(array('result' => 'no', 'data' => '不知道哪里错了，看代码')); + } + + public function edit_save($ic_id = false, $textarea_htmlcode = false, $amp_status = false) { + $data = array(); + if ($ic_id === false) { + $ic_id = $this->CI->input->post('ic_id'); + } + if ($textarea_htmlcode === false) { + $textarea_htmlcode = $this->CI->input->post('textarea_htmlcode'); + } + if ($amp_status === false) { + $amp_status = $this->CI->input->post('amp_status'); + } + $data['information'] = $this->CI->Information_model->detail_by_ic_id($ic_id); + + if ($data['information'] == FALSE) { + show_404(); + } + + //CH的页面没有canonical内容，在这里帮补上 + $textarea_htmlcode = str_replace('', $this->CI->config->item('site_url') . $data['information']->ic_url, $textarea_htmlcode); + + //备份修改的代码 + $this->CI->Logs_model->write('backup_amp', $ic_id, $textarea_htmlcode); + + //AMP格式验证 + if ($amp_status !== '0') {//只有发布的时候才需要验证 + //把AMP网页内容到purifycss处理，内置了AMP-Validator + $purifycss_server = 'http://184.172.113.216:33033/'; + if ($this->CI->config->item('site_code' == 'gm')) {//德语站点使用自己的css处理服务器 + $purifycss_server = 'http://158.177.67.52:33033/'; + } + $validator_result = GET_HTTP($purifycss_server, 'amp_source=' . urlencode($textarea_htmlcode), 'POST'); + $validator_result = json_decode($validator_result); + if ($validator_result->status == 'FAIL') { + return json_encode(array('name' => 'no', 'value' => $validator_result->errors)); + } + } + $amp = $this->CI->InfoMetas_model->get($ic_id, 'AMP'); + if ($amp === false) { + $this->CI->InfoMetas_model->add($ic_id, 'AMP', $textarea_htmlcode); + } else { + $this->CI->InfoMetas_model->update($ic_id, 'AMP', $textarea_htmlcode); + } + + $amp_status_value = $this->CI->InfoMetas_model->get($ic_id, 'AMP_STATUS'); + if ($amp_status_value === false) { + $this->CI->InfoMetas_model->add($ic_id, 'AMP_STATUS', $amp_status); + } else { + $this->CI->InfoMetas_model->update($ic_id, 'AMP_STATUS', $amp_status); + } + + return json_encode(array('name' => 'ok', 'value' => $this->CI->lang->line('form_info_success'))); + } + +} diff --git a/application/libraries/MY_Composer.php b/application/libraries/MY_Composer.php new file mode 100644 index 00000000..6cad19e7 --- /dev/null +++ b/application/libraries/MY_Composer.php @@ -0,0 +1,15 @@ +. +// +// ---------------------------------------------------------------------------- +// +// Description : PHP class to read DOCX file into HTML format +// +// Author: Ricardo Pinto +// +// (c) Copyright: +// Ricardo Pinto +//============================================================+ + +class WordPHP +{ + private $debug = false; + private $file; + private $rels_xml; + private $doc_xml; + private $doc_media = array(); + private $last = 'none'; + private $encoding = 'UTF-8'; + private $tmpDir = 'tmp'; + //图片目录和前缀 + public $img_dir = ''; + public $img_prex = ''; + + /** + * CONSTRUCTOR + * + * @param Boolean $debug Debug mode or not + * @return void + */ + public function __construct($debug_=null, $encoding=null) + { + if($debug_ != null) { + $this->debug = $debug_; + } + if ($encoding != null) { + $this->encoding = $encoding; + } + $this->tmpDir = dirname(__FILE__); + } + + /** + * Sets the tmp directory where images will be stored + * + * @param string $tmp The location + * @return void + */ + private function setTmpDir($tmp) + { + $this->tmpDir = $tmp; + } + + /** + * READS The Document and Relationships into separated XML files + * + * @param var $object The class variable to set as DOMDocument + * @param var $xml The xml file + * @param string $encoding The encoding to be used + * @return void + */ + private function setXmlParts(&$object, $xml, $encoding) + { + $object = new DOMDocument(); + $object->encoding = $encoding; + $object->preserveWhiteSpace = false; + $object->formatOutput = true; + $object->loadXML($xml); + $object->saveXML(); + } + + /** + * READS The Document and Relationships into separated XML files + * + * @param String $filename The filename + * @return void + */ + private function readZipPart($filename) + { + $zip = new ZipArchive(); + $_xml = 'word/document.xml'; + $_xml_rels = 'word/_rels/document.xml.rels'; + + if (true === $zip->open($filename)) { + if (($index = $zip->locateName($_xml)) !== false) { + $xml = $zip->getFromIndex($index); + } + //Get the relationships + if (($index = $zip->locateName($_xml_rels)) !== false) { + $xml_rels = $zip->getFromIndex($index); + } + // load all images if they exist + for ($i=0; $i<$zip->numFiles;$i++) { + $zip_element = $zip->statIndex($i); + if(preg_match("([^\s]+(\.(?i)(jpg|jpeg|png|gif|bmp))$)",$zip_element['name'])) { + $this->doc_media[$zip_element['name']] = $zip_element['name']; + } + } + $zip->close(); + } else die('non zip file'); + + $enc = mb_detect_encoding($xml); + $this->setXmlParts($this->doc_xml, $xml, $enc); + $this->setXmlParts($this->rels_xml, $xml_rels, $enc); + + if($this->debug) { + echo ""; + echo ""; + } + } + + /** + * CHECKS THE FONT FORMATTING OF A GIVEN ELEMENT + * Currently checks and formats: bold, italic, underline, background color and font family + * + * @param XML $xml The XML node + * @return String HTML formatted code + */ + private function checkFormating(&$xml) + { + $node = trim($xml->readOuterXML()); + $t = ''; + // add
tags + if (mb_strstr($node,'XML($node); + $img = null; + + while ($reader->read()) { + if($reader->name == "w:b") { + $f .= "font-weight: bold,"; + } + if($reader->name == "w:i") { + $f .= "text-decoration: underline,"; + } + if($reader->name == "w:color") { + $f .="color: #".$reader->getAttribute("w:val").","; + } + if($reader->name == "w:rFont") { + $f .="font-family: #".$reader->getAttribute("w:ascii").","; + } + if($reader->name == "w:shd" && $reader->getAttribute("w:val") != "clear" && $reader->getAttribute("w:fill") != "000000") { + $f .="background-color: #".$reader->getAttribute("w:fill").","; + } + $temp_rx = $reader->readInnerXml(); + if($reader->name == 'w:drawing' && !empty($temp_rx)) { + $r = $this->checkImageFormating($reader); + $img = $r !== null ? "" : null; + } + } + + $f = rtrim($f, ','); + $f .= "'>"; + $t .= ($img !== null ? $img : htmlentities($xml->expand()->textContent)); + + return $f.$t.""; + } + + /** + * CHECKS THE ELEMENT FOR UL ELEMENTS + * Currently under development + * + * @param XML $xml The XML node + * @return String HTML formatted code + */ + private function getListFormating(&$xml) + { + $node = trim($xml->readOuterXML()); + + $reader = new XMLReader(); + $reader->XML($node); + $ret=""; + $close = ""; + while ($reader->read()){ + if($reader->name == "w:numPr" && $reader->nodeType == XMLReader::ELEMENT ) { + + } + if($reader->name == "w:numId" && $reader->hasAttributes) { + switch($reader->getAttribute("w:val")) { + case 1: + $ret['open'] = "
  1. "; + $ret['close'] = "
"; + break; + case 2: + $ret['open'] = ""; + break; + } + + } + } + return $ret; + } + + /** + * CHECKS IF THERE IS AN IMAGE PRESENT + * Currently under development + * + * @param XML $xml The XML node + * @return String The location of the image + */ + private function checkImageFormating(&$xml) + { + $content = trim($xml->readInnerXml()); + + if (!empty($content)) { + + $relId; + $notfound = true; + $reader = new XMLReader(); + $reader->XML($content); + + while ($reader->read() && $notfound) { + if ($reader->name == "a:blip") { + $relId = $reader->getAttribute("r:embed"); + $notfound = false; + } + } + + // image id found, get the image location + if (!$notfound && $relId) { + $reader = new XMLReader(); + $reader->XML($this->rels_xml->saveXML()); + + while ($reader->read()) { + if ($reader->nodeType == XMLREADER::ELEMENT && $reader->name=='Relationship') { + if($reader->getAttribute("Id") == $relId) { + $link = "word/".$reader->getAttribute('Target'); + break; + } + } + } + + $zip = new ZipArchive(); + $im = null; + if (true === $zip->open($this->file)) { + $im = $this->createImage($zip->getFromName($link), $relId, $link); + } + $zip->close(); + return $im; + } + } + + return null; + } + + /** + * Creates an image in the filesystem + * + * @param objetc $image The image object + * @param string $relId The image relationship Id + * @param string $name The image name + * @return Array With HTML open and closing tag definition + */ + private function createImage($image, $relId, $name) + { + $arr = explode('.', $name); + $l = count($arr); + $ext = mb_strtolower($arr[$l-1]); + + $im = imagecreatefromstring($image); + if (empty($this->img_dir)) { + $fname = $this->tmpDir.'/tmp/'.$relId.'.'.$ext; + } else { + $ext = str_ireplace('jpeg', 'jpg', $ext); + $fname = $this->img_dir.'/'.$this->img_prex.'_'.mb_strtolower($relId).'.'.$ext; + } + + + switch ($ext) { + case 'png': + imagepng($im, $fname); + break; + case 'bmp': + imagebmp($im, $fname); + break; + case 'gif': + imagegif($im, $fname); + break; + case 'jpeg': + case 'jpg': + imagejpeg($im, $fname); + break; + default: + return null; + } + + return $fname; + } + + /** + * CHECKS IF ELEMENT IS AN HYPERLINK + * + * @param XML $xml The XML node + * @return Array With HTML open and closing tag definition + */ + private function getHyperlink(&$xml) + { + $ret = array('open'=>''); + $link =''; + if($xml->hasAttributes) { + $attribute = ""; + while($xml->moveToNextAttribute()) { + if($xml->name == "r:id") + $attribute = $xml->value; + } + + if($attribute != "") { + $reader = new XMLReader(); + $reader->XML($this->rels_xml->saveXML()); + + while ($reader->read()) { + if ($reader->nodeType == XMLREADER::ELEMENT && $reader->name=='Relationship') { + if($reader->getAttribute("Id") == $attribute) { + $link = $reader->getAttribute('Target'); + break; + } + } + } + } + } + + if($link != "") { + $ret['open'] = ""; + $ret['close'] = ""; + } + + return $ret; + } + + + /** + * PROCESS TABLE CONTENT + * + * @param XML $xml The XML node + * @return THe HTML code of the table + */ + private function checkTableFormating(&$xml) + { + $table = ""; + + while ($xml->read()) { + if ($xml->nodeType == XMLREADER::ELEMENT && $xml->name === 'w:tr') { //table row + $tc = $ts = ""; + + + $tr = new XMLReader; + $tr->xml(trim($xml->readOuterXML())); + + while ($tr->read()) { + if ($tr->nodeType == XMLREADER::ELEMENT && $tr->name === 'w:tcPr') { //table element properties + $ts = $this->processTableStyle(trim($tr->readOuterXML())); + } + if ($tr->nodeType == XMLREADER::ELEMENT && $tr->name === 'w:tc') { //table column + $tc .= $this->processTableRow(trim($tr->readOuterXML())); + } + } + $table .= ''.$tc.''; + } + } + + $table .= "
"; + return $table; + } + + /** + * PROCESS THE TABLE ROW STYLE + * + * @param string $content The XML node content + * @return THe HTML code of the table + */ + private function processTableStyle($content) + { + /*border-collapse:collapse; + border-bottom:4px dashed #0000FF; + border-top:6px double #FF0000; + border-left:5px solid #00FF00; + border-right:5px solid #666666;*/ + + $tc = new XMLReader; + $tc->xml($content); + $style = "border-collapse:collapse;"; + + while ($tc->read()) { + if ($tc->name === "w:tcBorders") { + $tc2 = new SimpleXMLElement($tc->readOuterXML()); + + foreach ($tc2->children('w',true) as $ch) { + if (in_array($ch->getName(), array('left','top','botom','right'))) { + $line = $this->convertLine($ch['val']); + $style .= " border-".$ch->getName().":".$ch['sz']."px $line #".$ch['color'].";"; + } + } + + $tc->next(); + } + } + return $style; + } + + private function convertLine($in) + { + if (in_array($in, array('dotted'))) + return "dashed"; + + if (in_array($in, array('dotDash','dotdotDash','dotted','dashDotStroked','dashed','dashSmallGap'))) + return "dashed"; + + if (in_array($in, array('double','triple','threeDEmboss','threeDEngrave','thick'))) + return "double"; + + if (in_array($in, array('nil','none'))) + return "none"; + + return "solid"; + } + + /** + * PROCESS THE TABLE ROW + * + * @param string $content The XML node content + * @return THe HTML code of the table + */ + private function processTableRow($content) + { + $tc = new XMLReader; + $tc->xml($content); + $ct = ""; + + while ($tc->read()) { + if ($tc->name === "w:r") { + $ct .= "".$this->checkFormating($tc).""; + $tc->next(); + } + } + return $ct; + } + + /** + * READS THE GIVEN DOCX FILE INTO HTML FORMAT + * + * @param String $filename The DOCX file name + * @return String With HTML code + */ + public function readDocument($filename) + { + $this->file = $filename; + $this->readZipPart($filename); + $reader = new XMLReader(); + $reader->XML($this->doc_xml->saveXML()); + + $text = ''; $list_format=""; + + $formatting['header'] = 0; + // loop through docx xml dom + while ($reader->read()) { + // look for new paragraphs + $paragraph = new XMLReader; + $p = $reader->readOuterXML(); + //return $p; + + if ($reader->nodeType == XMLREADER::ELEMENT && $reader->name === 'w:p') { + // set up new instance of XMLReader for parsing paragraph independantly + $paragraph->xml($p); + + preg_match('/ 0) ? '' : '

'; + + // loop through paragraph dom + while ($paragraph->read()) { + // look for elements + if ($paragraph->nodeType == XMLREADER::ELEMENT && $paragraph->name === 'w:r') { + if($list_format == "") + $text .= $this->checkFormating($paragraph); + else { + $text .= $list_format['open']; + $text .= $this->checkFormating($paragraph); + $text .= $list_format['close']; + } + $list_format =""; + $paragraph->next(); + } + else if($paragraph->nodeType == XMLREADER::ELEMENT && $paragraph->name === 'w:pPr') { //lists + $list_format = $this->getListFormating($paragraph); + $paragraph->next(); + } + else if($paragraph->nodeType == XMLREADER::ELEMENT && $paragraph->name === 'w:drawing') { //images + $text .= $this->checkImageFormating($paragraph); + $paragraph->next(); + } + else if ($paragraph->nodeType == XMLREADER::ELEMENT && $paragraph->name === 'w:hyperlink') { + $hyperlink = $this->getHyperlink($paragraph); + $text .= $hyperlink['open']; + $text .= $this->checkFormating($paragraph); + $text .= $hyperlink['close']; + $paragraph->next(); + } + } + $text .= ($formatting['header'] > 0) ? '' : '

'; + } + else if ($reader->nodeType == XMLREADER::ELEMENT && $reader->name === 'w:tbl') { //tables + $paragraph->xml($p); + $text .= $this->checkTableFormating($paragraph); + $reader->next(); + } + } + $reader->close(); + if($this->debug) { + echo "
"; + echo mb_convert_encoding($text, $this->encoding); + echo "
"; + } + return mb_convert_encoding($text, $this->encoding); + } +} \ No newline at end of file diff --git a/application/models/infoContents_model.php b/application/models/infoContents_model.php index aa37343e..676d76db 100644 --- a/application/models/infoContents_model.php +++ b/application/models/infoContents_model.php @@ -85,6 +85,14 @@ class InfoContents_model extends CI_Model return $query; } + //删除信息 + function force_update($ic_id, $ic_content) + { + $sql = "UPDATE infoContents SET ic_content = N? WHERE ic_id = ?"; + $query = $this->HT->query($sql, array($ic_content, $ic_id)); + return $query; + } + //删除信息 function Delete($ic_id) { @@ -126,7 +134,7 @@ class InfoContents_model extends CI_Model public function get_ic_contents2($ic_id) { - $sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo from infoContents where ic_id=?"; + $sql="SELECT top 1 ic_id, ic_content, ic_title, ic_url, ic_photo, ic_sitecode, ic_seo_description from infoContents where ic_id=?"; $query=$this->HT->query($sql,array($ic_id)); if ($query->result()) { diff --git a/application/models/infoMetas_model.php b/application/models/infoMetas_model.php index 1010b214..08264246 100644 --- a/application/models/infoMetas_model.php +++ b/application/models/infoMetas_model.php @@ -16,7 +16,7 @@ class InfoMetas_model extends CI_Model { . " ( \n" . " ?, ?, N? \n" . " )"; - return $this->HT->query($sql, array($im_ic_id, $im_key, $im_value)); + return $this->HT->query($sql, array($im_ic_id, $im_key, (string)$im_value)); } function get_list($im_ic_id, $im_key) { @@ -33,6 +33,102 @@ class InfoMetas_model extends CI_Model { $query = $this->HT->query($sql, array($im_ic_id, $im_key)); return $query->result(); } + + function get_list_by_key($im_key) { + $sql = " + SELECT im.im_id + ,im.im_ic_id + ,im.im_key + ,im.im_value + FROM infoMetas im + WHERE im.im_ic_id = ? + AND im.im_key = ? + ORDER BY im.im_id ASC + "; + $query = $this->HT->query($sql, array($im_ic_id, $im_key)); + return $query->result(); + } + + //列表所有含AMPmeta的信息。 + public function list_amp($site_code) { + $sql = " + SELECT im.im_id + ,im.im_ic_id + ,c.ic_url + ,c.ic_id + ,empty_tpl = case when c.ic_template in ('r_tpl_empty', 'r_empty_container', 'r_empty2', 'r_tpl_empty_2017', 'tpl_empty', 'tpl_empty_h1', 'tpl_empty_navi_h1') then 'yes' else 'no' end + FROM infoMetas im + INNER JOIN infoContents c + ON c.ic_id = im.im_ic_id + LEFT JOIN infoMetas im2 + ON im2.im_ic_id = im.im_ic_id AND im2.im_key = 'AMP_STATUS' + LEFT JOIN infoMetas im3 + ON im3.im_ic_id = im.im_ic_id AND im2.im_key = 'AMP_SCHEMA' + WHERE im.im_key = 'AMP_JSON' + AND c.ic_sitecode = ? + AND c.ic_status = 1 + AND CONVERT(varchar, im2.im_value) = '1' + "; + $query = $this->HT->query($sql, array($site_code)); + return $query->result(); + } + + //列表所有不含AMPmeta的信息。 + public function list_no_amp($site_code) { + $sql = " + SELECT c0.ic_id, c0.ic_url + FROM infoContents c0 + WHERE c0.ic_id not in ( + SELECT c.ic_id + FROM infoMetas im + LEFT JOIN infoContents c + ON c.ic_id = im.im_ic_id + LEFT JOIN infoMetas im2 + ON im2.im_ic_id = im.im_ic_id AND im2.im_key = 'AMP_STATUS' + LEFT JOIN infoMetas im3 + ON im3.im_ic_id = im.im_ic_id AND im2.im_key = 'AMP_SCHEMA' + WHERE im.im_key = 'AMP_JSON' + AND c.ic_sitecode = ? + AND c.ic_status = 1 + AND CONVERT(varchar, im2.im_value) = '1' + ) + AND c0.ic_sitecode = ? + AND c0.ic_status = 1 + AND c0.ic_url <> '' + AND datalength(c0.ic_content) > 0 + AND CHARINDEX('search', c0.ic_url) = 0 + AND CHARINDEX('faq', c0.ic_url) = 0 + AND CHARINDEX('feedback', c0.ic_url) = 0 + AND CHARINDEX('test', c0.ic_url) = 0 + "; + $query = $this->HT->query($sql, array($site_code, $site_code)); + return $query->result(); + } + + //按节点列表信息（含meta数据） + function list_info_by_path_with_meta($is_path, $site_code) { + $sql = "SELECT is1.is_id, \n" + . " is1.is_path, \n" + . " ic.ic_id, \n" + . " ic.ic_url, \n" + . " ic.ic_status, \n" + . " ic.ic_template, \n" + . " ic.ic_sitecode, \n" + . " ic.ic_content, \n" + . " ic.ic_photo, \n" + . " ic.ic_title, \n" + . " ic.ic_type, \n" + . " im.im_id \n" + . " FROM infoStructures is1 \n" + . " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n" + . " AND ic.ic_sitecode = is1.is_sitecode \n" + . " LEFT JOIN infoMetas im ON im.im_ic_id = ic.ic_id AND im.im_key=?" + . " WHERE is1.is_path LIKE '$is_path%' AND is_sitecode = ? AND ic_status = 1" + . " ORDER BY is1.is_level, is1.is_sort, is1.is_path"; + $query = $this->HT->query($sql, array('AMP_JSON', $site_code)); + //print_r($this->HT->queries); + return $query->result(); + } function get($im_ic_id, $im_key) { $sql = "SELECT im.im_value \n" @@ -81,7 +177,7 @@ class InfoMetas_model extends CI_Model { . "SET im_value = N? \n" . "WHERE im_ic_id = ? \n" . " AND im_key = ?"; - return $this->HT->query($sql, array($im_value, $im_ic_id, $im_key)); + return $this->HT->query($sql, array((string)$im_value, $im_ic_id, $im_key)); } function delete($im_ic_id, $im_key) { diff --git a/application/models/information_model.php b/application/models/information_model.php index c5b991a0..b1b78052 100644 --- a/application/models/information_model.php +++ b/application/models/information_model.php @@ -74,14 +74,14 @@ class Information_model extends CI_Model { } //根据根节点路径获取子节点列表 - function get_list_by_path($path, $level = false) { + function get_list_by_path($path, $level = false, $site_code = false) { $this->init(); if ($level !== false) { $this->level = " AND is1.is_level= '$level' "; } $this->path = " AND is1.is_path LIKE '$path%' "; $this->orderBy = ' ORDER BY is1.is_level ASC, is1.is_sort ASC,is1.is_path ASC '; - return $this->GetList(); + return $this->GetList('', $site_code); } //根据路径获取某一级别节点详细页 @@ -129,7 +129,7 @@ class Information_model extends CI_Model { return $this->GetList(); } - function GetList($filed = "") { + function GetList($filed = "", $site_code = "") { $this->topNum ? $sql = "SELECT TOP " . $this->topNum : $sql = "SELECT "; if (empty($filed)) { $sql .= " is1.is_id, \n" @@ -164,10 +164,14 @@ class Information_model extends CI_Model { . " ic.ic_ht_area_type, \n" . " ic.ic_ht_product_id, \n" . " ic.ic_ht_product_type, \n" + . " ic.SRMS_SIC_Code, \n" + . " ic.SRMS_SIIT_Code, \n" . " ic.ic_author \n"; } else { $sql.=" $filed "; } + //添加查询AMP发布状态 + $sql.=",isnull((select top 1 CONVERT(varchar, im_value) from infoMetas where im_ic_id=ic_id and im_key='AMP_STATUS'),0) as amp_status "; $sql.="FROM infoStructures is1 \n" . " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n" . " AND ic.ic_sitecode = is1.is_sitecode \n" @@ -187,7 +191,7 @@ class Information_model extends CI_Model { $this->orderBy ? $sql.=$this->orderBy : false; - $query = $this->HT->query($sql, array($this->config->item('site_code'))); + $query = $this->HT->query($sql, array($site_code ? $site_code : $this->config->item('site_code'))); //print_r($this->HT->queries); if ($this->topNum === 1) { if ($query->num_rows() > 0) { @@ -357,4 +361,54 @@ class Information_model extends CI_Model { return $query->result(); } + + //ct + function ct_get_by_url($ic_url,$webcode) + { + $this->ic_url_is_id=" AND ic.ic_url = N".$this->HT->escape($ic_url); + $sql = "SELECT is1.is_id, \n" + . " is1.is_parent_id, \n" + . " is1.is_path, \n" + . " is1.is_level, \n" + . " is1.is_sort, \n" + . " is1.is_sitecode, \n" + . " is1.is_datetime, \n" + . " is1.is_ic_id, \n" + . " ic.ic_id, \n" + . " ic.ic_url, \n" + . " ic.ic_url_title, \n" + . " ic.ic_type, \n" + . " ic.ic_title, \n" + . " ic.ic_content, \n" + . " ic.ic_summary, \n" + . " ic.ic_seo_title, \n" + . " ic.ic_seo_description, \n" + . " ic.ic_seo_keywords, \n" + . " ic.ic_show_bread_crumbs, \n" + . " ic.ic_status, \n" + . " ic.ic_template, \n" + . " ic.ic_photo, \n" + . " ic.ic_photo_width, \n" + . " ic.ic_photo_height, \n" + . " ic.ic_sitecode, \n" + . " ic.ic_recommend_tours, \n" + . " ic.ic_recommend_packages, \n" + . " ic.ic_datetime, \n" + . " ic.ic_ht_area_id, \n" + . " ic.ic_ht_area_type, \n" + . " ic.ic_ht_product_id, \n" + . " ic.ic_ht_product_type, \n" + . " ic.ic_author \n" + . " FROM infoStructures is1 \n" + . " INNER JOIN infoContents ic ON ic.ic_id = is1.is_ic_id \n" + . " AND ic.ic_sitecode = is1.is_sitecode \n" + . " WHERE is1.is_sitecode = ? "; + $sql .= $this->ic_url_is_id; + $query = $this->HT->query($sql, $webcode); + // print_r($this->HT->queries); + + return $query->row(); + } + + } diff --git a/application/models/orders_model.php b/application/models/orders_model.php index a374cc16..7d28d0a7 100644 --- a/application/models/orders_model.php +++ b/application/models/orders_model.php @@ -59,6 +59,24 @@ class Orders_model extends CI_Model { } } + //获取当天商务订单 + function biz_count() { + $date_start = date('Y-m-d', time() - 86400);//减一天 + $date_end = date('Y-m-d', time() + 86400);//加一天 + $sql = " + SELECT COUNT(1) AS CLI_COUNT + FROM BIZ_ConfirmLineInfo bcli + WHERE bcli.COLI_ApplyDate BETWEEN '$date_start 00:00:00' AND '$date_end 23:59:59' + "; + $query = $this->HT->query($sql); + if ($query->num_rows() > 0) { + $row = $query->row(); + return $row->CLI_COUNT; + } else { + return FALSE; + } + } + //获取当天商务订单 function get_biz_info($sitecode) { $sql = "SELECT bcli.COLI_ID, n" diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php new file mode 100644 index 00000000..1836268e --- /dev/null +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -0,0 +1,325 @@ +load->helper('ctrip'); + $this->load->model("ctrip_model"); + date_default_timezone_set('PRC'); + + } + + public function index(){ + exit('hello ctrip'); + } + + //查询车次余票 + public function search(){ + //接收参数 + $date = $this->input->get_post('date'); + $from = $this->input->get_post('from'); + $to = $this->input->get_post('to'); + $TrainNo = $this->input->get_post('TrainNo'); + + if(!$date || !$from || !$to){ + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); + }else{ + $isCache = false; + $iseven = false; + $cachedata = false; + $now_time = time(); + $differ = (strtotime($date) - $now_time) / 86400; + if($differ > 29){ + $date = date('Y-m-d',strtotime('+7day')); + $iseven = true; + } + + //转换三字码为中文 + $FromName = $this->ctrip_model->ReplaceCodeToName($from); + $ToName = $this->ctrip_model->ReplaceCodeToName($to); + + + if(!$FromName || !$ToName){ + header("HTTP/1.1 404 Not Found"); + exit('{"httpstatus":404,"data":{"seven":false,"cache":false,"result":[],"map":{}}}'); + }else{ + $from = $FromName->station_name; + $to = $ToName->station_name; + } + + //生成请求链接 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'SearchS2S/?From='.urlencode($from).'&To='.urlencode($to).'&DepartDate='.$date.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + + $api_start_time = microtime(true); + + //获取数据 + $ResponseJson = post_ctrip($url,'','GET'); + + $api_end_time = microtime(true); + + $ResponseData = json_decode($ResponseJson); + $api_responsive_time = $api_end_time - $api_start_time; + //print_r($ResponseData);die(); + + if(empty($ResponseData->Trains)){ + log_message('error','ctrip_trian|status:trains is empty |相应时间:'.$api_responsive_time); + }else{ + log_message('error','ctrip_trian|status:'.$ResponseData->ResponseStatus->Ack.'|相应时间:'.$api_responsive_time); + } + + //定义返回的json + $ReturnData = new stdClass(); + $ReturnData->httpstatus = 200; + $ReturnData->data = new stdClass(); + $ReturnData->data->seven = $iseven; + $ReturnData->data->cache = $isCache; + $ReturnData->data->result = array(); + $ReturnData->data->map = new stdClass(); + $obj = array(); + $i = 0; + $PriceStr = ''; + //数据解析 + if(!empty($ResponseData->Trains)){ + foreach ($ResponseData->Trains as $TrainInfo){ + $obj[$TrainInfo->FromTelcode] = $TrainInfo->FromStationName; + $obj[$TrainInfo->ToTelcode] = $TrainInfo->ToStationName; + $SeaType = ''; + $gjrwNum = $rwNum = $rzNum = $tdzNum = $wzNum = $yzNum = $edzNum = $ydzNum = $swzNum = $ywNum = $dwNum = null; + foreach($TrainInfo->Seats as $Seats){ + if($Seats->SeatName == '高级软卧下'){ + $gjrwXiaPrice = $Seats->Price * 10; + $SeaType .= '"6":"'.$gjrwXiaPrice.'","A6":"¥'.$Seats->Price.'",'; + $gjrwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '软卧下'){ + $rwPrice = $Seats->Price * 10; + $SeaType .= '"4":"'.$rwPrice.'","A4":"¥'.$Seats->Price.'",'; + $rwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '一等双软下'){ + $ydrwPrice = $Seats->Price * 10; + $SeaType .= '"I":"'.$ydrwPrice.'","AI":"¥'.$Seats->Price.'",'; + $ydrwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '软座'){ + $rzPrice = $Seats->Price * 10; + $SeaType .= '"2":"'.$rzPrice.'","A2":"¥'.$Seats->Price.'",'; + $rzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '特等座'){ + $SeaType .= '"P":"¥'.$Seats->Price.'",'; + $tdzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '无座'){ + $SeaType .= '"WZ":"¥'.$Seats->Price.'",'; + $wzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '硬座'){ + $yzPrice = $Seats->Price * 10; + $SeaType .= '"1":"'.$yzPrice.'","A1":"¥'.$Seats->Price.'",'; + $yzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '二等座'){ + $SeaType .= '"O":"¥'.$Seats->Price.'",'; + $edzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '一等座'){ + $SeaType .= '"M":"¥'.$Seats->Price.'",'; + $ydzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '商务座'){ + $swzPrice = $Seats->Price * 10; + $SeaType .= '"9":"'.$swzPrice.'","A9":"¥'.$Seats->Price.'",'; + $swzNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '硬卧下'){ + $ywPrice = $Seats->Price * 10; + $SeaType .= '"3":"'.$ywPrice.'","A3":"¥'.$Seats->Price.'",'; + $ywNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '二等双软下'){ + $errwPrice = $Seats->Price * 10; + $SeaType .= '"J":"'.$errwPrice.'","AJ":"¥'.$Seats->Price.'",'; + $errwNum = $Seats->TicketLeft; + } + + if($Seats->SeatName == '动卧下'){ + $SeaType .= '"F":"¥'.$Seats->Price.'",'; + $dwNum = $Seats->TicketLeft; + } + + $PriceStr = $SeaType.'"train_no":'.'"'.$TrainInfo->TrainNo.'"'; + } + + + //对返回的数据进行容错处理 + $gjrwNum = isset($gjrwNum) ? ticket_exchange($gjrwNum,$iseven) : ''; + $rwNum = isset($rwNum) ? ticket_exchange($rwNum,$iseven) : ''; + $rzNum = isset($rzNum) ? ticket_exchange($rzNum,$iseven) : ''; + $tdzNum = isset($tdzNum) ? ticket_exchange($tdzNum,$iseven) : ''; + $wzNum = isset($wzNum) ? ticket_exchange($wzNum,$iseven) : ''; + $ywNum = isset($ywNum) ? ticket_exchange($ywNum,$iseven) : ''; + $yzNum = isset($yzNum) ? ticket_exchange($yzNum,$iseven) : ''; + $edzNum = isset($edzNum) ? ticket_exchange($edzNum,$iseven) : ''; + $ydzNum = isset($ydzNum) ? ticket_exchange($ydzNum,$iseven) : ''; + $swzNum = isset($swzNum) ? ticket_exchange($swzNum,$iseven) : ''; + $dwNum = isset($dwNum) ? ticket_exchange($dwNum,$iseven) : ''; + $ydrwNum = isset($ydrwNum) ? ticket_exchange($ydrwNum,$iseven) : ''; + $errwNum = isset($errwNum) ? ticket_exchange($errwNum,$iseven) : ''; + + if($rwNum == '' && $ydrwNum != ''){ + $rwNum = $ydrwNum; + } + + if($ywNum == '' && $errwNum != ''){ + $ywNum = $errwNum; + } + + $runMin = $TrainInfo->DurationMinutes % 60; + $runHour = ($TrainInfo->DurationMinutes - $runMin) / 60; + + $ReturnData->data->result[$i] = '|预定|'.$TrainInfo->Train12306No.'|'.$TrainInfo->TrainNo.'|'.$TrainInfo->FromStationName.'|'.$TrainInfo->ToStationName.'|'.$TrainInfo->FromTelcode.'|'.$TrainInfo->ToTelcode.'|'.$TrainInfo->StartTime.'|'.$TrainInfo->ArriveTime.'|'.$runHour.':'.$runMin.'|'.$TrainInfo->CanWebBuy.'||'.date('Ymd',strtotime($date)).'||||||||'.$gjrwNum.'||'.$rwNum.'|'.$rzNum.'|'.$tdzNum.'|'.$wzNum.'||'.$ywNum.'|'.$yzNum.'|'.$edzNum.'|'.$ydzNum.'|'.$swzNum.'|'.$dwNum.'||'; + + $data = '{"validateMessagesShowId":"_validatorMessage","status":true,"httpstatus":200,"data":{'.$PriceStr.'},"messages":[],"validateMessages":{}}'; + $ReturnData->data->price[$i] = $data; + $i++; + } + } + //print_r($ResponseData); + $ReturnData->data->map = (object)$obj; + print_r(json_encode($ReturnData)); + } + } + + //查询经停站 + public function getstopstation(){ + //接收参数 + $DepartDate = $this->input->get_post('DepartDate'); + $TrainNo = $this->input->get_post('TrainNo'); + + if(!$DepartDate || !$TrainNo){ + exit('传参错误！'); + }else{ + //生成请求链接 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'GetStopStations/?DepartDate='.$DepartDate.'&TrainNo='.$TrainNo.'&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + + $ResponseJson = post_ctrip($url,'','GET'); + $ResponseData = json_decode($ResponseJson); + + //构造12306格式 + $ReturnData = array(); + $ReturnData['validateMessagesShowId'] = '_validatorMessage'; + $ReturnData['status'] = true; + $ReturnData['httpstatus'] = 200; + $ReturnData['data'] = array(); + $i = 0; + $Last_num = count($ResponseData->StopStations); + foreach($ResponseData->StopStations as $items){ + if($i == 0){ + $ReturnData['data']['data'][$i]['start_station_name'] = $items->StationName; + $ReturnData['data']['data'][$i]['station_train_code'] = $TrainNo; + $ReturnData['data']['data'][$i]['end_station_name'] = $ResponseData->StopStations[$Last_num-1]->StationName; + } + $ReturnData['data']['data'][$i]['arrive_time'] = $items->ArrivalTime; + $ReturnData['data']['data'][$i]['station_name'] = $items->StationName; + $ReturnData['data']['data'][$i]['start_time'] = $items->StartTime; + $ReturnData['data']['data'][$i]['stopover_time'] = $items->StopMinutes; + $ReturnData['data']['data'][$i]['station_no'] = $items->StationNo; + $ReturnData['data']['data'][$i]['isEnabled'] = true; + $i++; + } + $ReturnData['messages'] = array(); + $ReturnData['validateMessages'] = new stdClass(); + print_r(json_encode($ReturnData)); + } + } + + //获取所有站点信息 + public function getallstation(){ + //生成请求参数 + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $url = JSONRETURN.'/GetAllStations/?&User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign; + + $ResponseJson = post_ctrip($url,'','GET'); + + $ResponseData = json_decode($ResponseJson); + + $data = array(); + foreach ($ResponseData->Stations as $items){ + $data['StationName'] = isset($items->StationName) ? checkNull($items->StationName) : ''; + $data['PinYin'] = isset($items->PinYin) ? checkNull($items->PinYin) : ''; + $data['Telecode'] = isset($items->Telecode) ? checkNull($items->Telecode) : ''; + $data['Address'] = isset($items->Address) ? checkNull($items->Address) : ''; + $data['Geography'] = isset($items->Geography) ? checkNull($items->Geography) : ''; + $this->ctrip_model->AddOrUpdate($data); + } + } + + //查询中转方案 + public function gettraintrainsfer(){ + $FromCode = $this->input->get_post('FromCode'); + $ToCode = $this->input->get_post('ToCode'); + $DepartDate = $this->input->get_post('DepartDate'); + + if(!$FromCode || !$ToCode || !$DepartDate){ + exit('传参错误！'); + }else{ + $TimeStamp = time(); + $Sign = md5($TimeStamp.DATAKEY); + + $FromName = $this->ctrip_model->ReplaceCodeToName($FromCode); + $ToName = $this->ctrip_model->ReplaceCodeToName($ToCode); + + $From = $FromName->station_name; + $To = $ToName->station_name; + + $url = JSONRETURN.'GetTrainTransfer?User='.DATAUSER.'&TimeStamp='.$TimeStamp.'&Sign='.$Sign.'&From='.urlencode($From).'&To='.urlencode($To).'&DepartDate='.$DepartDate; + + + $ResponseJson = post_ctrip($url,'','GET'); + //$ResponseData = json_decode($ResponseJson); + print_r($ResponseJson); + } + } +} \ No newline at end of file diff --git a/application/third_party/ctrip/helpers/ctrip_helper.php b/application/third_party/ctrip/helpers/ctrip_helper.php new file mode 100644 index 00000000..b84711e4 --- /dev/null +++ b/application/third_party/ctrip/helpers/ctrip_helper.php @@ -0,0 +1,81 @@ += 99){ + return '有'; + }else{ + return $num; + } + } + } + } + + //发送请求函数 + function post_ctrip($url, $data = '', $method = 'GET') { + $user_agent = "Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1"; + if(isset($_SERVER['HTTP_USER_AGENT'])) { + $user_agent = $_SERVER['HTTP_USER_AGENT']; + } + $curl = curl_init(); // 启动一个CURL会话 + curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($curl, CURLOPT_USERAGENT, $user_agent); // 模拟用户使用的浏览器 + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 + curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer + if ($method == 'POST' && !empty($data)) { + curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求 + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 + curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); + } + curl_setopt($curl, CURLOPT_TIMEOUT, 40); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_TIMEOUT_MS, 40000); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 + $tmpInfo = curl_exec($curl); // 执行操作 + $errno = curl_errno($curl); + if ($errno !== 0) { + log_message('error', 'ctripost'.$errno.curl_error($curl)); + } + curl_close($curl); //关闭CURL会话 + return $tmpInfo; //返回数据 + } + +?> \ No newline at end of file diff --git a/application/third_party/ctrip/models/ctrip_model.php b/application/third_party/ctrip/models/ctrip_model.php new file mode 100644 index 00000000..fac981e4 --- /dev/null +++ b/application/third_party/ctrip/models/ctrip_model.php @@ -0,0 +1,68 @@ +INFO = $this->load->database('INFO', TRUE); + } + + //» + public function AddOrUpdate($data){ + $sql = "IF NOT EXISTS( + SELECT 1 + FROM train_stations + WHERE + station_telecode = '{$data['Telecode']}' + ) BEGIN + INSERT INTO train_stations + ( + station_name, + station_telecode, + station_geography, + station_pinyin, + station_address + ) + VALUES + ( + '{$data['StationName']}','{$data['Telecode']}','{$data['Geography']}','{$data['PinYin']}','{$data['Address']}' + ) + END + ELSE + BEGIN + UPDATE train_stations + SET station_name = '{$data['StationName']}', + station_geography = '{$data['Geography']}', + station_pinyin = '{$data['PinYin']}', + station_address = '{$data['Address']}' + WHERE + station_telecode = '{$data['Telecode']}' + END + "; + $query = $this->INFO->query($sql); + return $query; + } + + //ȡĻϢ + //ȡ7ǰݾͲκݣҽɾ + public function get_train_cache($tpc_from_station,$tpc_to_station){ + $sql = "SELECT + * + FROM + TrainPriceCache + WHERE + tpc_from_station = '$tpc_from_station' + AND + tpc_to_station = '$tpc_to_station'"; + $query = $this->INFO->query($sql); + return $query->row(); + } + + //ȡվ + public function ReplaceCodeToName($code){ + $sql = "SELECT station_name from train_stations where station_telecode = '{$code}'"; + $query = $this->INFO->query($sql); + return $query->row(); + } + +} +?> \ No newline at end of file diff --git a/application/third_party/htmlcompressor/controllers/index.php b/application/third_party/htmlcompressor/controllers/index.php index c0f4cb25..3b3cabda 100644 --- a/application/third_party/htmlcompressor/controllers/index.php +++ b/application/third_party/htmlcompressor/controllers/index.php @@ -1,146 +1,334 @@ -load->library('simple_html_dom_lib'); - } - - public function index() { - $this->load->view('welcome'); - } - - public function optimize() { - $htmlsource = $this->input->post('htmlsource'); - $websitehost = $this->input->post('websitehost'); - if (empty($htmlsource) || empty($websitehost)) { - $this->output->set_status_header(500); - echo 'error:htmlsource or websitehost is empty!'; - log_message('error', "htmlsource or websitehost is empty! " . $websitehost); - return false; - } - //域名后面不能有/ - if (substr($websitehost, -1, 1) == '/') { - $websitehost = substr($websitehost, 0, -1); - } - - $html_object = str_get_html($htmlsource); - if (!empty($html_object)) { - -//提取和下载所有CSS样式，包括链接文件和页面样式 - $link_css_array = array(); - $css_content = ''; - foreach ($html_object->find('link') as $link_css) { - if ($link_css->rel == 'stylesheet' && !empty($link_css->href)) { - $link_css_array[] = $link_css->href; - $link_css->outertext = ''; //删除链接 - } - } - //print_r($link_css_array); - foreach ($link_css_array as $item) { - $get_http_temp = GET_HTTP($this->format_url($item, $websitehost)); - if ($get_http_temp == false) { - $this->output->set_status_header(404); - echo 'CSS文件下载错误'; - log_message('error', "optimize CSS文件下载错误! " . $item); - return FALSE; - } - $css_content.=$get_http_temp; - } - foreach ($html_object->find('style') as $style_css) { - if ($style_css->type == "text/css") { - $css_content .= $style_css->innertext; - } - } - // echo $css_content; - // echo $html_object;die(); - // -//提取和下载所有JS脚本，包括链接文件和页面脚本 - $link_js_array = array(); - $js_inline_content = ''; - $js_jquery_content = ''; - foreach ($html_object->find('script') as $link_script) { - if (!empty($link_script->src)) { - if(empty($link_script->defer) && empty($link_script->async)){ //没有defer标记的才处理，否则让js延后加载 - $link_js_array[] = $link_script->src; - $link_script->outertext = ''; //删除链接，移动到页底 - } - } else { - //网页内的js不需要提取 - //$js_content.= $link_script->innertext;//js的内容 - // $js_content.= $link_script;//js的内容，包含'; - - $js_content = $js_scr_content . $js_jquery_content; - //延迟加载js，需要把返回的js代码保存到一个文件中，然后替换占位符，以便加载js文件 - $lastload_js.=''; - $lastload_js.=$js_inline_content; - - $html_object = str_replace('', $lastload_js . '', $html_object); - } - echo json_encode(array('result' => 'ok', 'data' => array('html_object' => $html_object, 'js_content' => $js_content))); - } - -//格式化url，保证请求的URL有域名，//更换为对应的域名路径 - function format_url($url, $host = '') { - if (substr($url, 0, 8) == 'https://' || substr($url, 0, 7) == 'http://') { - return urldecode($url); - } - - if (substr($url, 0, 2) == '//') { //https或http - return urldecode(str_replace('//', 'http://', $url)); - } - - return urldecode($host . $url); - } - -} +load->library('simple_html_dom_lib'); + } + + public function index() + { + $this->load->view('welcome'); + } + + public function optimize() + { + $htmlsource = $this->input->post('htmlsource'); + $websitehost = $this->input->post('websitehost'); + $template_name = $this->input->post('template_name'); + $create_amp = $this->input->post('create_amp'); + $debug = $this->input->post('debug'); + if (empty($htmlsource) || empty($websitehost)) { + $this->output->set_status_header(500); + echo 'error:htmlsource or websitehost is empty!'; + log_message('error', "htmlsource or websitehost is empty! " . $websitehost); + return false; + } + //域名后面不能有/ + if (substr($websitehost, -1, 1) == '/') { + $websitehost = substr($websitehost, 0, -1); + } + + $html_object = str_get_html($htmlsource); + if (!empty($html_object)) { + +//提取和下载所有CSS样式，包括链接文件和页面样式 + $link_css_array = array(); + $css_content = ''; + foreach ($html_object->find('link') as $link_css) { + if ($link_css->rel == 'stylesheet' && !empty($link_css->href)) { + $link_css_array[] = $link_css->href; + $link_css->outertext = ''; //删除链接 + } + } + //print_r($link_css_array); + foreach ($link_css_array as $item) { + $get_http_temp = GET_HTTP($this->format_url($item, $websitehost)); + if ($get_http_temp == false) { + $this->output->set_status_header(404); + echo 'CSS文件下载错误'; + log_message('error', "optimize CSS文件下载错误! " . $item); + return FALSE; + } + $css_content .= $get_http_temp; + } + foreach ($html_object->find('style') as $style_css) { + if ($style_css->type == "text/css") { + $css_content .= $style_css->innertext; + } + } + // echo $css_content; + // echo $html_object;die(); + // +//提取和下载所有JS脚本，包括链接文件和页面脚本 + $link_js_array = array(); + $js_inline_content = ''; + $js_jquery_content = ''; + foreach ($html_object->find('script') as $link_script) { + if (!empty($link_script->src)) { + if (empty($link_script->defer) && empty($link_script->async)) { //没有defer标记的才处理，否则让js延后加载 + $link_js_array[] = $link_script->src; + $link_script->outertext = ''; //删除链接，移动到页底 + } + } else { + //网页内的js不需要提取 + //$js_content.= $link_script->innertext;//js的内容 + // $js_content.= $link_script;//js的内容，包含'; + + $js_content = $js_scr_content . $js_jquery_content; + //延迟加载js，需要把返回的js代码保存到一个文件中，然后替换占位符，以便加载js文件 + $lastload_js .= ''; + $lastload_js .= $js_inline_content; + + $html_object = str_replace('', $lastload_js . '', $html_object); + } + + //只返回AMP代码 + if (!empty($create_amp)) { + $amp = $this->create_amp($html_object, $template_name, $websitehost,$debug); + echo json_encode(array('result' => 'ok', 'data' => array('amp' => $amp))); + return; + } + echo json_encode(array('result' => 'ok', 'data' => array('html_object' => $html_object, 'js_content' => $js_content))); + + } + +//格式化url，保证请求的URL有域名，//更换为对应的域名路径 + function format_url($url, $host = '') + { + if (substr($url, 0, 8) == 'https://' || substr($url, 0, 7) == 'http://') { + $url = str_replace('http://', 'https://', $url);//http要改为https + return urldecode($url); + } + + if (substr($url, 0, 2) == '//') { //https或http + return urldecode('https://'.substr($url, 2, strlen($url)-2)); //只替换开头的//，部分url不规范，有//在url中间 + } + + return urldecode($host . $url); + } + + + +//生成AMP版本 用移动端版本生成 + /* + 1.加载站点AMP模板，模板只有导航、头部、底部 + 2.删除全部js引用和内链代码 + 3.删除全部css引用，内联css放入", $this->html_object); + //删除多余空格和换行符 + $this->html_object = str_replace(array(" ", "\t", "\n", "\r"), " ", $this->html_object); + //循环n次，把双空格替换为一个空格 + for ($i = 0; $i <= 4; $i++) { + $this->html_object = str_replace(" ", " ", $this->html_object); + } + + //在最后加载原始css文件和js文件 + //把css移动到页面底部，延迟加载 + $lastload_js = ''; + + $js_content = $js_scr_content . $js_jquery_content; + //延迟加载js，需要把返回的js代码保存到一个文件中，然后替换占位符，以便加载js文件 + $lastload_js .= ''; + $lastload_js .= $js_inline_content; + + $this->html_object = str_replace('', $lastload_js . '', $this->html_object); + echo json_encode(array('result' => 'ok', 'data' => array('html_object' => $this->html_object, 'js_content' => $js_content))); + } + + //生成AMP版本 用移动端版本生成 + /* + 1.加载站点AMP模板，模板只有导航、头部、底部 + 2.删除全部js引用和内链代码 + 3.删除全部css引用，内联css放入 + + + + + + + + + +
+
+ + +
+ + + +
+
+ CUSTOMIZE
+
+ + + +
+
✕
+
+ + + + + + +
+ + + +
+
+@AMP-GOOGLE-ANALYTICS@ + + + diff --git a/application/third_party/htmlcompressor/views/amp-template/cht.php b/application/third_party/htmlcompressor/views/amp-template/cht.php new file mode 100644 index 00000000..fb951b4b --- /dev/null +++ b/application/third_party/htmlcompressor/views/amp-template/cht.php @@ -0,0 +1,136 @@ + + + + +<!--@TITLE@--> + + + + + + + + + + + + + + + + +
+
+ + China Highlights ® + CUSTOMIZE +
+
+ + + +
+
✕
+
+ + + + + + + + + +
+ Start planning your tailor-made China tour … + Create My Trip +
+ + + + + + + +
+ + diff --git a/application/third_party/htmlcompressor/views/amp-template/ct.php b/application/third_party/htmlcompressor/views/amp-template/ct.php new file mode 100644 index 00000000..338379ef --- /dev/null +++ b/application/third_party/htmlcompressor/views/amp-template/ct.php @@ -0,0 +1,218 @@ + + + + +<!--@TITLE@--> + + + + + + + + + + + + + + +
+
China Travel ® CUSTOMIZE
+
+ + +
+
✕
+
+ + + + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/htmlcompressor/views/amp-template/gm.php b/application/third_party/htmlcompressor/views/amp-template/gm.php new file mode 100644 index 00000000..63ca3a47 --- /dev/null +++ b/application/third_party/htmlcompressor/views/amp-template/gm.php @@ -0,0 +1,45 @@ + + + + + <!--@TITLE@--> + + + + + + + + + + + + + + + + + + + +
+@AMP-COMMON-HEADER@ + + + +@AMP-COMMON-FOOTER@ + +
+
+ + + \ No newline at end of file diff --git a/application/third_party/htmlcompressor/views/welcome.php b/application/third_party/htmlcompressor/views/welcome.php index e18468fd..2c57e7e0 100644 --- a/application/third_party/htmlcompressor/views/welcome.php +++ b/application/third_party/htmlcompressor/views/welcome.php @@ -14,7 +14,23 @@

页面样式精简



- + + +

+ + + +

+
diff --git a/application/third_party/order/controllers/confirm.php b/application/third_party/order/controllers/confirm.php index 4dda6cd4..e8c3e11b 100644 --- a/application/third_party/order/controllers/confirm.php +++ b/application/third_party/order/controllers/confirm.php @@ -30,14 +30,14 @@ class Confirm extends CI_Controller { } } } else { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } $visitor_link_arr = $this->Order_model->get_visitor_link($COLI_SN); foreach ($visitor_link_arr as $l) { if ($visitor_link == $l->visitor_link) { - $this->load->view($site_code.'/link_tips', $data); + $this->load->view($site_code.'/link_tips', $data); return false; } } @@ -57,10 +57,16 @@ class Confirm extends CI_Controller { $COLI_SN = $this->input->post('COLI_SN'); $visitor_link = $this->input->post('visitor_link'); $COLI_ID = $this->input->post('COLI_ID'); + //航班信息 + $MEI_ArrivalFlightNo = $this->input->post('MEI_ArrivalFlightNo'); + $MEI_ArrivalTime = $this->input->post('MEI_ArrivalTime'); + $MEI_DepartureFlightNo = $this->input->post('MEI_DepartureFlightNo'); + $MEI_DepartureTime = $this->input->post('MEI_DepartureTime'); //已经确认过 $had_save = $this->Order_model->get_visitor_link($COLI_SN, $visitor_link); + if (!empty($had_save)) { echo json_encode(array('status' => 'ok')); return; @@ -74,7 +80,7 @@ class Confirm extends CI_Controller { } elseif ($this->input->post('address_street')) { $MEI_Street = $this->input->post('address_street') . ',' . $this->input->post('address_city') . ',' . $this->input->post('address_state') . ',' . $this->input->post('address_country'); } else { - $MEI_Street = ''; + $MEI_Street = $this->input->post('street').','.$this->input->post('city').','.$this->input->post('country'); } $data['MEI_Street'] = $MEI_Street; if (isset($given_name[$key]) && $given_name[$key] != 'None') { @@ -85,34 +91,21 @@ class Confirm extends CI_Controller { $MEI_LastName = $name; - if ($this->input->post('arrive_flight')) { - $CUL_Memo = 'Arrival China Flight No : ' - . $this->input->post('arrive_flight') - . ' & Arrival time : ' - . $this->input->post('arrive_time') - . ' & Departure China Flight no : ' - . $this->input->post('departure_flight') - . ' & Departure time : ' - . $this->input->post('depart_time'); - } else { - $CUL_Memo = ''; - } - $CUL_Memo .= $this->input->post('insurance_information'); + $CUL_Memo = $this->input->post('insurance_information'); $MEI_Memo = $this->input->post('special_request') . ' ' . $CUL_Memo; - //$birthday[$key] = date('Y-m-d H:i:s', strtotime($birthday[$key])); $birthday_tmp = date('Y-m-d H:i:s', strtotime($birthday[$key])); - //$expiration_date[$key] = date('Y-m-d H:i:s', strtotime($expiration_date[$key])); $expiration_date_tmp = date('Y-m-d H:i:s', strtotime($expiration_date[$key])); - $MEI_SN = $this->Order_model->add_customer_info($gender[$key], $nationality[$key], $MEI_FirstName, $MEI_LastName, $passport[$key], $expiration_date_tmp, $birthday_tmp, $MEI_Memo, $MEI_Street, '', $contact_phone, 0, $COLI_SN, $visitor_link); + $MEI_SN = $this->Order_model->add_customer_info($gender[$key], $nationality[$key], $MEI_FirstName, $MEI_LastName, $passport[$key], $expiration_date_tmp, $birthday_tmp, $MEI_Memo, $MEI_Street, '', $contact_phone, 0, $COLI_SN, $visitor_link,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime); } } if ($MEI_SN && $this->input->post('emergency_person_name') != '') { $add_emergency_res = $this->Order_model->add_customer_info( '', '', $this->input->post('emergency_person_name'), '', '', '', '', $this->input->post('emergency_relationship'), '', $this->input->post('emergency_email'), $this->input->post('emergency_telephone'), 1, $COLI_SN, $visitor_link + ,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime ); } @@ -133,7 +126,7 @@ class Confirm extends CI_Controller { echo json_encode(array('status' => 'no')); } } - + //只有ch有review功能 function review() { $data = array(); diff --git a/application/third_party/order/models/order_model.php b/application/third_party/order/models/order_model.php index be036f56..9ba407c6 100644 --- a/application/third_party/order/models/order_model.php +++ b/application/third_party/order/models/order_model.php @@ -43,7 +43,7 @@ class Order_model extends CI_Model { } //添加客人信息 - public function add_customer_info($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList='',$MEI_Phone='',$CUL_IsEmergency=0,$CUL_COLI_SN='',$visitor_link='') + public function add_customer_info($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList='',$MEI_Phone='',$CUL_IsEmergency=0,$CUL_COLI_SN='',$visitor_link='',$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime) { $createdate=date('Y-m-d H:i:s'); $sql="INSERT INTO MEmberInfoTmpCheck @@ -69,9 +69,13 @@ class Order_model extends CI_Model { visitor_link, CreateDate, CUL_IsLinkMan, - copyState - ) VALUES (?,?,?,?,?,?,?,?,?,?,?,102001,0,0,1,1,?,?,?,?,0,0) "; - $this->HT->query($sql, array($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList,$MEI_Phone,$CUL_IsEmergency,$CUL_COLI_SN,$visitor_link,$createdate)); + copyState, + MEI_ArrivalFlightNo, + MEI_ArrivalTime, + MEI_DepartureFlightNo, + MEI_DepartureTime + ) VALUES (?,?,?,?,?,?,?,?,?,?,?,102001,0,0,1,1,?,?,?,?,0,0,?,?,?,?) "; + $this->HT->query($sql, array($MEI_Gender,$MEI_Nationality,$MEI_FirstName,$MEI_LastName,$MEI_PassportNo,$MEI_PassportValidDate,$MEI_Birthday,$MEI_Memo,$MEI_Street,$MEI_MailList,$MEI_Phone,$CUL_IsEmergency,$CUL_COLI_SN,$visitor_link,$createdate,$MEI_ArrivalFlightNo,$MEI_ArrivalTime,$MEI_DepartureFlightNo,$MEI_DepartureTime)); $insertid = $this->HT->last_id('MEmberInfoTmpCheck');//$this->HT->insert_id(); return $insertid; } diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index 1661dcd2..05a815f3 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -7,13 +7,13 @@ China Highlights! Please complete and submit the information. - + - + @@ -70,7 +70,10 @@
-

Passenger Information (we need passport info for all the group members)

+

Passenger Information (we need passport info for all the group members)
+ Please ensure the details you provide are correct, as stated in your passport. We use this information to book all your hotels and transportation. If the name you provide are incorrect, you would not be able to board your flight or trains in China, and therefore reissuing of tickets would be at your expense! +

+
- +开始更新
diff --git a/application/views/bootstrap/header.php b/application/views/bootstrap/header.php index ac30a510..feb5f103 100644 --- a/application/views/bootstrap/header.php +++ b/application/views/bootstrap/header.php @@ -80,8 +80,12 @@
  • 广告管理
  • TA评论采集
  • 老旧信息查询
    • +
  • AMP转化检查
  • Html基础知识
    • -
  • AMP知识及构建SOP
    • +
  • AMP知识
    • +
  • AMP操作SOP
    • +
  • HTML构建工具V3
    • +
  • PS基础课件
  • 系统设置
    • diff --git a/application/views/bootstrap/information_edit.php b/application/views/bootstrap/information_edit.php index c6d0f27f..a5e1400e 100644 --- a/application/views/bootstrap/information_edit.php +++ b/application/views/bootstrap/information_edit.php @@ -350,32 +350,6 @@ return true; } - - //添加绑定景点 - function add_landscape(area_id, lsi_sn) { - var urlReQuery = ""; - $.ajax({ - type: "get", - url: urlReQuery + '/' + area_id + '/' + lsi_sn, - success: function(data, textStatus) { - var dataArray = $.parseJSON(data);//JSON.parse(data); - for (var key in dataArray) { - if (dataArray[key].name == 'ok') { - window.location.href = dataArray[key].value; - return true; - } else if (dataArray[key].name == 'no') { - $.modaldialog.error(dataArray[key].value); - return false; - } - } - }, - error: function() { - $.modaldialog.error('发生错误，请联系YCC'); - return false; - } - }); - } - //跳转到前台页面 function goto_page() { var site_url = 'config->item('site_url') ?>'; @@ -1000,7 +974,7 @@
    - +
    - - - \ No newline at end of file diff --git a/application/views/bootstrap/infoshare_week.php b/application/views/bootstrap/infoshare_week.php index 6bf7d4f0..c7e45873 100644 --- a/application/views/bootstrap/infoshare_week.php +++ b/application/views/bootstrap/infoshare_week.php @@ -3,7 +3,7 @@ URLS - + diff --git a/application/views/bootstrap/welcome.php b/application/views/bootstrap/welcome.php index 4b01fa01..d2bca395 100644 --- a/application/views/bootstrap/welcome.php +++ b/application/views/bootstrap/welcome.php @@ -10,6 +10,7 @@
  • 信息模块
    • +
  • 首页
  • 专题管理
  • 交换链接
  • 机场信息
    • @@ -40,6 +41,8 @@
  • CDN定时更新
  • 订单邮件管理
  • 信息分享平台
    • +
  • 全站静态化更新
    • +
  • 全站AMP更新
  • diff --git a/application/views/bootstrap3/footer.php b/application/views/bootstrap3/footer.php index 502ad690..796427df 100644 --- a/application/views/bootstrap3/footer.php +++ b/application/views/bootstrap3/footer.php @@ -15,7 +15,7 @@
    -

    静态化更新-系列站专用

    +

    静态化更新

    @@ -34,6 +34,32 @@
    + + + diff --git a/application/views/bootstrap3/header.php b/application/views/bootstrap3/header.php index 395cb2cb..7ff1d696 100644 --- a/application/views/bootstrap3/header.php +++ b/application/views/bootstrap3/header.php @@ -5,8 +5,8 @@ 信息平台 - - + + +
    +
    + + +
    + +
    + +
    + + + +
    +
    +
    +
    + +
    +
    + session->userdata('session_admin'); +$show_photo_meta = get_meta($information->ic_id, 'meta_use_list_picture'); +$amp_photo = ''; +if ($information->ic_photo && $show_photo_meta !== 'no') { + $amp_photo = $this->config->item('site_image_url') . $information->ic_photo; +} +$amp_build_url = "/amp_app/?icid=" . $information->ic_id . "&is_path=" . $information->is_path . "&usr=" . urlencode($amp_user['OPI_Name']) . "&url=" . urlencode($information->ic_url) . "&photo=" . urlencode($amp_photo) . "&site=" . urlencode($this->config->item('site_url')) . "&imgurl=" . urlencode($this->config->item('site_image_url')); +?> + ic_id, 'AMP_BODY_PC_STATUS') == 'yes') { + $PcAmpChecked = 'checked'; + } else { + $PcAmpChecked = ''; } + ?> + + | + | + + + amp_status === '1') {?> + + + amp_status === '2') {?> + + + amp_status === '0') {?> + + +
    +
    + +
    +
    +
    +
    +
    +
    链接标题
    + +
    +
    +
    +
    链接地址 + + + ic_sitecode == 'cht') {?> + + + ic_sitecode == 'gm') {?> + + +
    + +
    +
    + + - +
    +
    + - //选择主图片 - function openKCFinder_Root() { - var site_url = 'config->item('site_url') ?>'; - var weburl = encodeURI(site_url + $("#ic_url").val()); - window.CallBack = openKCFinder_Root_callback; - window.open('/media/popselectpicture.php?site_code=config->item('site_code'); ?>&site_lgc=config->item('site_lgc'); ?>&WebUrl=' + weburl, 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600'); - } - function openKCFinder_Root_callback(result) { - var site_image_url = 'config->item('media_image_url') ?>'; - if (result != null && result.Pinfo[0]) { - $("#ic_photo").val(result.Pinfo[0].PUrl); - $("#ic_photo_img").attr("src", site_image_url + result.Pinfo[0].PUrl); - $("#ic_photo_width").val(result.Pinfo[0].Width); - $("#ic_photo_height").val(result.Pinfo[0].Height); - $("#use_pictures").val(result.Pinfo[0].ID + ':' + result.Pinfo[0].PUrl + ':' + result.Pinfo[0].wh + ','); - } - } + +
    + + +
    - //删除主图片 - function delete_root_image() { - $("#ic_photo").val(''); - $("#ic_photo_img").attr("src", '/css/images/uploadPic.jpg'); - } +
    + + +
    - //选择内容图片 - function openKCFinder_Content() { - var site_url = 'config->item('site_url') ?>'; - var weburl = encodeURI(site_url + $("#ic_url").val()); - window.CallBack = openKCFinder_Content_callback; - window.open('/media/popselectpicture.php?site_code=config->item('site_code'); ?>&site_lgc=config->item('site_lgc'); ?>&WebUrl=' + weburl, 'kcfinder_textbox', 'status=0, toolbar=0, location=0, menubar=0, directories=0,resizable=1, scrollbars=0, width=800, height=600'); - } - function openKCFinder_Content_callback(result) { - var site_image_url = 'config->item('media_image_url') ?>'; - var use_pictures = $("#use_pictures").val(); - if (result != null) { - for (var key in result.Pinfo) { - if ('config->item('site_code') ?>' == 'cht') { - editor.insertHtml('
    ' + result.Pinfo[key].Sinfo + '' + result.Pinfo[key].Sinfo + '
    '); - insertoutP(); - } else { - editor.insertHtml('' + result.Pinfo[key].PName + ''); - } - use_pictures = use_pictures + result.Pinfo[key].ID + ':' + result.Pinfo[key].PUrl + ':' + result.Pinfo[key].wh + ','; - } - $("#use_pictures").val(use_pictures); - } - } +
    + + +
    - //搜索产品列表 - function select_product_list(product_type, product_name) { - $("#product_list_ul").html('waiting...'); - $.ajax({ - type: "post", - dataType: "json", - url: "", - data: {'product_type': product_type, 'product_name': product_name}, - success: function (data, textStatus) { - for (var key in data) { - if (data[key].name == 'ok') { - $("#product_list_ul").html(data[key].value); - return true; - } - } - }, - error: function () { - $.modaldialog.error('发生错误，请联系YCC'); - return false; - } - }); - } +
    +
    + - //选择绑定的产品 - function select_product(product_type, product_id, product_title) { - $("#ic_ht_product_id").val(product_id); - $("#ic_ht_product_type").val(product_type); - $("#ht_product_title").val(product_title); - $('#ht_product_box').hide(); - } + - //格式化url - function format_url() { - var url = $('#ic_url').val(); - $('#ic_url').val(url.toLowerCase().replace(/ /g, '-')); - return true; - } +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + +

    +
    + +
    + +
    diff --git a/application/views/bootstrap3/refresh_amp_urls.php b/application/views/bootstrap3/refresh_amp_urls.php new file mode 100644 index 00000000..b82cac48 --- /dev/null +++ b/application/views/bootstrap3/refresh_amp_urls.php @@ -0,0 +1,128 @@ + + +
    +
    +
    + +
    + +
    + + + + + + + + + + + + $info) { + if ($info->ic_status == 1 && !empty($info->ic_url)) { + $i++; + ?> + + + + + + + + + +
    #发布URL更新进度
    + amp_status==='1'){echo ''; } ?> + amp_status==='2'){echo ''; } ?> + ic_url; ?>amp_status==='2'){echo '手动管理，不会自动更新'; } ?>
    +
    + +
    + 开始更新 +
    + + +
    + +
    diff --git a/application/views/cache/update.php b/application/views/cache/update.php index 1a6d50ff..61595611 100644 --- a/application/views/cache/update.php +++ b/application/views/cache/update.php @@ -3,9 +3,9 @@ 更新静态页-v1.0a - - - + + + + + + +
    +
    + +
    +
    + + + + + + + + + + + $it) { + if ($key == 800) break; + ?> + + + + + + + + +
    #文件名AMP转化
    ic_url);?> + 是'); + else + echo('否'); + ?> + + 编辑 +
    +
    +
    +
    + +
    + + \ No newline at end of file diff --git a/application/views/welcome.php b/application/views/welcome.php index e123e34e..7757fce0 100644 --- a/application/views/welcome.php +++ b/application/views/welcome.php @@ -5,7 +5,9 @@
    系统模块
    - +
    + 站点首页 +
    专题管理
    diff --git a/author/views/header.php b/author/views/header.php index 10c0d42e..2becc29c 100644 --- a/author/views/header.php +++ b/author/views/header.php @@ -3,18 +3,18 @@ CHT Author - - - - - - - - - + + + + + + + + + - - + + diff --git a/css/images/arrow.png b/css/images/arrow.png new file mode 100644 index 00000000..b5208ca5 Binary files /dev/null and b/css/images/arrow.png differ diff --git a/css/images/car.png b/css/images/car.png new file mode 100644 index 00000000..2f3551b4 Binary files /dev/null and b/css/images/car.png differ diff --git a/css/images/plane.png b/css/images/plane.png new file mode 100644 index 00000000..bd3857f8 Binary files /dev/null and b/css/images/plane.png differ diff --git a/css/images/point.PNG b/css/images/point.PNG new file mode 100644 index 00000000..d9fd55ec Binary files /dev/null and b/css/images/point.PNG differ diff --git a/css/images/ship.png b/css/images/ship.png new file mode 100644 index 00000000..ab6e4712 Binary files /dev/null and b/css/images/ship.png differ diff --git a/css/images/ship32x32.png b/css/images/ship32x32.png new file mode 100644 index 00000000..0ffe94f0 Binary files /dev/null and b/css/images/ship32x32.png differ diff --git a/css/images/train.png b/css/images/train.png new file mode 100644 index 00000000..a597a1c1 Binary files /dev/null and b/css/images/train.png differ diff --git a/css/images/train32x32.png b/css/images/train32x32.png new file mode 100644 index 00000000..f871d0f0 Binary files /dev/null and b/css/images/train32x32.png differ diff --git a/css/images/trainxMAX.png b/css/images/trainxMAX.png new file mode 100644 index 00000000..0b9313d8 Binary files /dev/null and b/css/images/trainxMAX.png differ diff --git a/css/webht/flatpicker.min.css b/css/webht/flatpicker.min.css new file mode 100644 index 00000000..f513a963 --- /dev/null +++ b/css/webht/flatpicker.min.css @@ -0,0 +1,3 @@ +/*flatpickr:begin*/ +.flatpickr-calendar{background:transparent;opacity:0;display:none;text-align:center;visibility:hidden;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;max-height:640px;visibility:visible;}.flatpickr-calendar.open{display:inline-block;z-index:99999;}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(0.23,1,0.32,1);animation:fpFadeInDown 300ms cubic-bezier(0.23,1,0.32,1);}.flatpickr-calendar.inline{display:block;position:relative;top:2px;}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px);}.flatpickr-calendar.static.open{z-index:999;display:block;}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7){-webkit-box-shadow:none !important;box-shadow:none !important;}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1){-webkit-box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0;}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0;}.flatpickr-calendar.showTimeInput.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6;}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto;}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px;}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.rightMost:after{left:auto;right:22px;}.flatpickr-calendar:before{border-width:5px;margin:0 -5px;}.flatpickr-calendar:after{border-width:4px;margin:0 -4px;}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%;}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6;}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff;}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%;}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6;}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff;}.flatpickr-calendar:focus{outline:0;}.flatpickr-wrapper{position:relative;display:inline-block;}.flatpickr-months{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.flatpickr-months .flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:28px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-bottom:5px;}.flatpickr-months .flatpickr-prev-month,.flatpickr-months .flatpickr-next-month{text-decoration:none;cursor:pointer;position:absolute;top:0px;line-height:16px;height:28px;padding:10px;z-index:3;}.flatpickr-months .flatpickr-prev-month.disabled,.flatpickr-months .flatpickr-next-month.disabled{display:none;}.flatpickr-months .flatpickr-prev-month i,.flatpickr-months .flatpickr-next-month i{position:relative;}.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,.flatpickr-months .flatpickr-next-month.flatpickr-prev-month{left:0;}.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,.flatpickr-months .flatpickr-next-month.flatpickr-next-month{right:0;}.flatpickr-months .flatpickr-prev-month:hover,.flatpickr-months .flatpickr-next-month:hover{color:#959ea9;}.flatpickr-months .flatpickr-prev-month:hover svg,.flatpickr-months .flatpickr-next-month:hover svg{fill:#f64747;}.flatpickr-months .flatpickr-prev-month svg,.flatpickr-months .flatpickr-next-month svg{width:14px;height:14px;}.flatpickr-months .flatpickr-prev-month svg path,.flatpickr-months .flatpickr-next-month svg path{-webkit-transition:fill 0.1s;transition:fill 0.1s;fill:inherit;}.numInputWrapper{position:relative;height:auto;}.numInputWrapper input,.numInputWrapper span{display:inline-block;}.numInputWrapper input{width:100%;}.numInputWrapper input::-ms-clear{display:none;}.numInputWrapper span{position:absolute;right:0;width:14px;padding:0 4px 0 2px;height:50%;line-height:50%;opacity:0;cursor:pointer;border:1px solid rgba(57,57,57,0.15);-webkit-box-sizing:border-box;box-sizing:border-box;}.numInputWrapper span:hover{background:rgba(0,0,0,0.1);}.numInputWrapper span:active{background:rgba(0,0,0,0.2);}.numInputWrapper span:after{display:block;content:"";position:absolute;}.numInputWrapper span.arrowUp{top:-2px;left:50px;}.numInputWrapper span.arrowUp:after{border-left:4px solid transparent;border-right:4px solid transparent;border-bottom:4px solid rgba(57,57,57,0.6);top:26%;}.numInputWrapper span.arrowDown{top:10px;left:50px;}.numInputWrapper span.arrowDown:after{border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid rgba(57,57,57,0.6);top:40%;}.numInputWrapper span svg{width:inherit;height:auto;}.numInputWrapper span svg path{fill:rgba(0,0,0,0.5);}.numInputWrapper:hover{cursor:pointer;}.numInputWrapper:hover span{opacity:1;}.flatpickr-current-month{font-size:17px;line-height:inherit;font-weight:300;color:inherit;position:absolute;width:75%;left:12.5%;padding:6.16px 0 0 0;line-height:1;height:28px;display:inline-block;text-align:center;-webkit-transform:translate3d(0px,0px,0px);transform:translate3d(0px,0px,0px);}.flatpickr-current-month span.cur-month{font-family:inherit;font-weight:700;color:inherit;display:inline-block;margin-left:0.5ch;padding:0;font-size:19px;color:#a31022;}.flatpickr-current-month span.cur-month:hover{cursor:pointer;}.flatpickr-current-month .numInputWrapper{width:6ch;width:7ch\0;display:inline-block;}.flatpickr-current-month .numInputWrapper span.arrowUp:after{border-bottom-color:rgba(0,0,0,0.9);}.flatpickr-current-month .numInputWrapper span.arrowDown:after{border-top-color:rgba(0,0,0,0.9);}.flatpickr-current-month input.cur-year{background:transparent;-webkit-box-sizing:border-box;box-sizing:border-box;color:inherit;cursor:text;padding:0 0 0 0.5ch;margin:0;display:inline-block;font-size:inherit;font-family:inherit;font-weight:300;line-height:inherit;height:auto;border:0;border-radius:0;vertical-align:initial;font-size:18px;}.flatpickr-current-month input.cur-year:focus{outline:0;}.flatpickr-current-month input.cur-year[disabled],.flatpickr-current-month input.cur-year[disabled]:hover{font-size:100%;color:rgba(0,0,0,0.5);background:transparent;pointer-events:none;}.flatpickr-weekdays{background:transparent;text-align:center;overflow:hidden;width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:28px;}.flatpickr-weekdays .flatpickr-weekdaycontainer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;}span.flatpickr-weekday{cursor:default;font-size:16px;background:transparent;color:rgba(0,0,0,0.54);line-height:1;margin:0;text-align:center;display:block;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;}.dayContainer,.flatpickr-weeks{padding:1px 0 0 0;}.flatpickr-days{position:relative;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;width:307.875px;}.flatpickr-days:focus{outline:0;}.dayContainer{padding:0;outline:0;text-align:left;width:307.875px;min-width:307.875px;max-width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;display:inline-block;display:-ms-flexbox;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-wrap:wrap;-ms-flex-pack:justify;-webkit-justify-content:space-around;justify-content:space-around;-webkit-transform:translate3d(0px,0px,0px);transform:translate3d(0px,0px,0px);opacity:1;}.dayContainer + .dayContainer{-webkit-box-shadow:-1px 0 0 #e6e6e6;box-shadow:-1px 0 0 #e6e6e6;}.flatpickr-day{background:none;border:1px solid transparent;border-radius:150px;-webkit-box-sizing:border-box;box-sizing:border-box;color:#a31022;cursor:pointer;font-weight:400;width:14.2857143%;-webkit-flex-basis:14.2857143%;-ms-flex-preferred-size:14.2857143%;flex-basis:14.2857143%;max-width:39px;height:39px;line-height:39px;margin:0;display:inline-block;position:relative;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;text-align:center;font-size:16px;}.flatpickr-day.inRange,.flatpickr-day.prevMonthDay.inRange,.flatpickr-day.nextMonthDay.inRange,.flatpickr-day.today.inRange,.flatpickr-day.prevMonthDay.today.inRange,.flatpickr-day.nextMonthDay.today.inRange,.flatpickr-day:hover,.flatpickr-day.prevMonthDay:hover,.flatpickr-day.nextMonthDay:hover,.flatpickr-day:focus,.flatpickr-day.prevMonthDay:focus,.flatpickr-day.nextMonthDay:focus{cursor:pointer;outline:0;background:#e6e6e6;border-color:#e6e6e6;}.flatpickr-day.today{border-color:#959ea9;}.flatpickr-day.today:hover,.flatpickr-day.today:focus{border-color:#959ea9;background:#959ea9;color:#fff;}.flatpickr-day.selected,.flatpickr-day.startRange,.flatpickr-day.endRange,.flatpickr-day.selected.inRange,.flatpickr-day.startRange.inRange,.flatpickr-day.endRange.inRange,.flatpickr-day.selected:focus,.flatpickr-day.startRange:focus,.flatpickr-day.endRange:focus,.flatpickr-day.selected:hover,.flatpickr-day.startRange:hover,.flatpickr-day.endRange:hover,.flatpickr-day.selected.prevMonthDay,.flatpickr-day.startRange.prevMonthDay,.flatpickr-day.endRange.prevMonthDay,.flatpickr-day.selected.nextMonthDay,.flatpickr-day.startRange.nextMonthDay,.flatpickr-day.endRange.nextMonthDay{background:#569ff7;-webkit-box-shadow:none;box-shadow:none;color:#fff;border-color:#569ff7;}.flatpickr-day.selected.startRange,.flatpickr-day.startRange.startRange,.flatpickr-day.endRange.startRange{border-radius:50px 0 0 50px;}.flatpickr-day.selected.endRange,.flatpickr-day.startRange.endRange,.flatpickr-day.endRange.endRange{border-radius:0 50px 50px 0;}.flatpickr-day.selected.startRange + .endRange,.flatpickr-day.startRange.startRange + .endRange,.flatpickr-day.endRange.startRange + .endRange{-webkit-box-shadow:-10px 0 0 #569ff7;box-shadow:-10px 0 0 #569ff7;}.flatpickr-day.selected.startRange.endRange,.flatpickr-day.startRange.startRange.endRange,.flatpickr-day.endRange.startRange.endRange{border-radius:50px;}.flatpickr-day.inRange{border-radius:0;-webkit-box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-5px 0 0 #e6e6e6,5px 0 0 #e6e6e6;}.flatpickr-day.disabled,.flatpickr-day.disabled:hover,.flatpickr-day.prevMonthDay,.flatpickr-day.nextMonthDay,.flatpickr-day.notAllowed,.flatpickr-day.notAllowed.prevMonthDay,.flatpickr-day.notAllowed.nextMonthDay{color:#848080;background:transparent;border-color:transparent;cursor:default;}.flatpickr-day.disabled,.flatpickr-day.disabled:hover{cursor:not-allowed;color:#d0d0d0;}.flatpickr-day.week.selected{border-radius:0;-webkit-box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7;box-shadow:-5px 0 0 #569ff7,5px 0 0 #569ff7;}.flatpickr-day.hidden{visibility:hidden;}.rangeMode .flatpickr-day{margin-top:1px;}.flatpickr-weekwrapper{display:inline-block;float:left;}.flatpickr-weekwrapper .flatpickr-weeks{padding:0 12px;-webkit-box-shadow:1px 0 0 #e6e6e6;box-shadow:1px 0 0 #e6e6e6;}.flatpickr-weekwrapper .flatpickr-weekday{float:none;width:100%;line-height:28px;}.flatpickr-weekwrapper span.flatpickr-day,.flatpickr-weekwrapper span.flatpickr-day:hover{display:block;width:100%;max-width:none;color:#9a9a9a;background:transparent;cursor:default;border:none;}.flatpickr-innerContainer{display:block;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;}.flatpickr-rContainer{display:inline-block;padding:0;-webkit-box-sizing:border-box;box-sizing:border-box;}.flatpickr-time{text-align:center;outline:0;display:block;height:0;line-height:40px;max-height:40px;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;}.flatpickr-time:after{content:"";display:table;clear:both;}.flatpickr-time .numInputWrapper{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;width:40%;height:40px;float:left;}.flatpickr-time .numInputWrapper span.arrowUp:after{border-bottom-color:#4f4f4f;}.flatpickr-time .numInputWrapper span.arrowDown:after{border-top-color:#4f4f4f;}.flatpickr-time.hasSeconds .numInputWrapper{width:26%;}.flatpickr-time.time24hr .numInputWrapper{width:49%;}.flatpickr-time input{background:transparent;-webkit-box-shadow:none;box-shadow:none;border:0;border-radius:0;text-align:center;margin:0;padding:0;height:inherit;line-height:inherit;cursor:pointer;color:#4f4f4f;font-size:14px;position:relative;-webkit-box-sizing:border-box;box-sizing:border-box;}.flatpickr-time input.flatpickr-hour{font-weight:bold;}.flatpickr-time input.flatpickr-minute,.flatpickr-time input.flatpickr-second{font-weight:400;}.flatpickr-time input:focus{outline:0;border:0;}.flatpickr-time .flatpickr-time-separator,.flatpickr-time .flatpickr-am-pm{height:inherit;display:inline-block;float:left;line-height:inherit;color:#4f4f4f;font-weight:bold;width:2%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-align-self:center;-ms-flex-item-align:center;align-self:center;}.flatpickr-time .flatpickr-am-pm{outline:0;width:18%;cursor:pointer;text-align:center;font-weight:400;}.flatpickr-time .flatpickr-am-pm:hover,.flatpickr-time .flatpickr-am-pm:focus{background:#f0f0f0;}.flatpickr-input[readonly]{cursor:pointer;}@-webkit-keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0);}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);}}@keyframes fpFadeInDown{from{opacity:0;-webkit-transform:translate3d(0,-20px,0);transform:translate3d(0,-20px,0);}to{opacity:1;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);}} +/*flatpickr:end*/ diff --git a/download_statement/download_files.php b/download_statement/download_files.php index 69a3f9ef..7e9c48a4 100644 --- a/download_statement/download_files.php +++ b/download_statement/download_files.php @@ -7,10 +7,23 @@ $sftp = new Net_SFTP('106.14.1.181'); if (!$sftp->login('10000004000', 'YRATF0OtDaYa2Uhv6cWO8BV9FPBup5')) { exit('Login Failed'); } -// 获取前一天的对账单 // target remote -$target_folder = str_replace("-", "/", date("Y-m", strtotime("-1 day")) ); +$target_folder = null; +$targer_day = null; +// 获取前一天的对账单 +$target_folder = str_replace("-", "/", date("Y-m", strtotime("-1 day")) ); // 2018/07 +if (isset($_GET['f'])) { + $target_folder = $_GET['f']; // f=2018/06 f=2018/07/23 + $target_set = explode('/', $target_folder); + if (isset($target_set[2])) { + $target_folder = $target_set[0] . "/" . $target_set[1]; + $targer_day = $target_set[2]; + } +} $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"); +} // target local $target_local = "statement_files/" . $target_folder; if ( ! is_dir($target_local)) { @@ -24,11 +37,15 @@ $new_files = array_values(array_diff($file_list, $local_files)); $new_cnt = 0; foreach ($new_files as $key => $new) { $file_path = $target_folder . "/" . $new; + echo $file_path, " ", $target_local . "/" . $new; + echo "
    "; $sftp->get($file_path, $target_local . "/" . $new); $new_cnt++; } echo "Copied new statements count: " . $new_cnt; +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)); // 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/js/basic.js b/js/basic.js index 68fd61de..3deded8f 100644 --- a/js/basic.js +++ b/js/basic.js @@ -38,6 +38,15 @@ function information_check() { flag = false; } + //信息备注og:description长度 + var og_description = $("#meta_note").val(); + var og_description_length = get_string_length(og_description); + if (sitecode == 'jp' || sitecode == 'ru') og_description_length = parseInt(og_description_length / 2); + if (og_description_length < 80 || og_description_length > 160) { + $("#error-tops").append('
  • og:description信息备注长度必须在80~160个字符之间[' + og_description_length + '个]
    • '); + flag = false; + } + //文章字数 var content_num = content_length; if (content_num < 1500) { diff --git a/js/flatpickr-4.4.4.min.js b/js/flatpickr-4.4.4.min.js new file mode 100644 index 00000000..b40382b2 --- /dev/null +++ b/js/flatpickr-4.4.4.min.js @@ -0,0 +1,2 @@ +/* flatpickr v4.4.4,, @license MIT */ +!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):e.flatpickr=t()}(this,function(){"use strict";var Z=function(e){return("0"+e).slice(-2)},Q=function(e){return!0===e?1:0};function X(n,a,i){var o;return void 0===i&&(i=!1),function(){var e=this,t=arguments;null!==o&&clearTimeout(o),o=window.setTimeout(function(){o=null,i||n.apply(e,t)},a),i&&!o&&n.apply(e,t)}}var ee=function(e){return e instanceof Array?e:[e]},e=function(){},te=function(e,t,n){return n.months[t?"shorthand":"longhand"][e]},D={D:e,F:function(e,t,n){e.setMonth(n.months.longhand.indexOf(t))},G:function(e,t){e.setHours(parseFloat(t))},H:function(e,t){e.setHours(parseFloat(t))},J:function(e,t){e.setDate(parseFloat(t))},K:function(e,t,n){e.setHours(e.getHours()%12+12*Q(new RegExp(n.amPM[1],"i").test(t)))},M:function(e,t,n){e.setMonth(n.months.shorthand.indexOf(t))},S:function(e,t){e.setSeconds(parseFloat(t))},U:function(e,t){return new Date(1e3*parseFloat(t))},W:function(e,t){var n=parseInt(t);return new Date(e.getFullYear(),0,2+7*(n-1),0,0,0,0)},Y:function(e,t){e.setFullYear(parseFloat(t))},Z:function(e,t){return new Date(t)},d:function(e,t){e.setDate(parseFloat(t))},h:function(e,t){e.setHours(parseFloat(t))},i:function(e,t){e.setMinutes(parseFloat(t))},j:function(e,t){e.setDate(parseFloat(t))},l:e,m:function(e,t){e.setMonth(parseFloat(t)-1)},n:function(e,t){e.setMonth(parseFloat(t)-1)},s:function(e,t){e.setSeconds(parseFloat(t))},w:e,y:function(e,t){e.setFullYear(2e3+parseFloat(t))}},ne={D:"(\\w+)",F:"(\\w+)",G:"(\\d\\d|\\d)",H:"(\\d\\d|\\d)",J:"(\\d\\d|\\d)\\w+",K:"",M:"(\\w+)",S:"(\\d\\d|\\d)",U:"(.+)",W:"(\\d\\d|\\d)",Y:"(\\d{4})",Z:"(.+)",d:"(\\d\\d|\\d)",h:"(\\d\\d|\\d)",i:"(\\d\\d|\\d)",j:"(\\d\\d|\\d)",l:"(\\w+)",m:"(\\d\\d|\\d)",n:"(\\d\\d|\\d)",s:"(\\d\\d|\\d)",w:"(\\d\\d|\\d)",y:"(\\d{2})"},c={Z:function(e){return e.toISOString()},D:function(e,t,n){return t.weekdays.shorthand[c.w(e,t,n)]},F:function(e,t,n){return te(c.n(e,t,n)-1,!1,t)},G:function(e,t,n){return Z(c.h(e,t,n))},H:function(e){return Z(e.getHours())},J:function(e,t){return void 0!==t.ordinal?e.getDate()+t.ordinal(e.getDate()):e.getDate()},K:function(e,t){return t.amPM[Q(11Math.min(t,n)&&e",noCalendar:!1,now:new Date,onChange:[],onClose:[],onDayCreate:[],onDestroy:[],onKeyDown:[],onMonthChange:[],onOpen:[],onParseConfig:[],onReady:[],onValueUpdate:[],onYearChange:[],onPreCalendarPosition:[],plugins:[],position:"auto",positionElement:void 0,prevArrow:"",shorthandCurrentMonth:!1,showMonths:1,static:!1,time_24hr:!1,weekNumbers:!1,wrap:!1};function de(e,t,n){if(!0===n)return e.classList.add(t);e.classList.remove(t)}function se(e,t,n){var a=window.document.createElement(e);return t=t||"",n=n||"",a.className=t,void 0!==n&&(a.textContent=n),a}function ue(e){for(;e.firstChild;)e.removeChild(e.firstChild)}function fe(e,t){var n=se("div","numInputWrapper"),a=se("input","numInput "+e),i=se("span","arrowUp"),o=se("span","arrowDown");if(a.type="text",a.pattern="\\d*",void 0!==t)for(var r in t)a.setAttribute(r,t[r]);return n.appendChild(a),n.appendChild(i),n.appendChild(o),n}"function"!=typeof Object.assign&&(Object.assign=function(n){if(!n)throw TypeError("Cannot convert undefined or null to object");for(var e=arguments.length,t=new Array(1o)&&(D.amPM.textContent=D.l10n.amPM[Q(D.amPM.textContent===D.l10n.amPM[0])]),n.value=Z(l)}}(e),"input"!==e.type?(m(),G()):setTimeout(function(){m(),G()},me))}function m(){if(void 0!==D.hourElement&&void 0!==D.minuteElement){var e,t,n=(parseInt(D.hourElement.value.slice(-2),10)||0)%24,a=(parseInt(D.minuteElement.value,10)||0)%60,i=void 0!==D.secondElement?(parseInt(D.secondElement.value,10)||0)%60:0;void 0!==D.amPM&&(e=n,t=D.amPM.textContent,n=e%12+12*Q(t===D.l10n.amPM[1]));var o=void 0!==D.config.minTime||D.config.minDate&&D.minDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.minDate,!0);if(void 0!==D.config.maxTime||D.config.maxDate&&D.maxDateHasTime&&D.latestSelectedDateObj&&0===re(D.latestSelectedDateObj,D.config.maxDate,!0)){var r=void 0!==D.config.maxTime?D.config.maxTime:D.config.maxDate;(n=Math.min(n,r.getHours()))===r.getHours()&&(a=Math.min(a,r.getMinutes())),a===r.getMinutes()&&(i=Math.min(i,r.getSeconds()))}if(o){var c=void 0!==D.config.minTime?D.config.minTime:D.config.minDate;(n=Math.max(n,c.getHours()))===c.getHours()&&(a=Math.max(a,c.getMinutes())),a===c.getMinutes()&&(i=Math.max(i,c.getSeconds()))}l(n,a,i)}}function g(e){var t=e||D.latestSelectedDateObj;t&&l(t.getHours(),t.getMinutes(),t.getSeconds())}function l(e,t,n){void 0!==D.latestSelectedDateObj&&D.latestSelectedDateObj.setHours(e%24,t,n||0,0),D.hourElement&&D.minuteElement&&!D.isMobile&&(D.hourElement.value=Z(D.config.time_24hr?e:(12+e)%12+12*Q(e%12==0)),D.minuteElement.value=Z(t),void 0!==D.amPM&&(D.amPM.textContent=D.l10n.amPM[Q(12<=e)]),void 0!==D.secondElement&&(D.secondElement.value=Z(n)))}function n(e){var t=parseInt(e.target.value)+(e.delta||0);4!==t.toString().length&&"Enter"!==e.key||(e.target.blur(),/[^\d]/.test(t.toString())||S(t))}function o(t,n,a,i){return n instanceof Array?n.forEach(function(e){return o(t,e,a,i)}):t instanceof Array?t.forEach(function(e){return o(e,n,a,i)}):(t.addEventListener(n,a,i),void D._handlers.push({element:t,event:n,handler:a}))}function a(t){return function(e){1===e.which&&t(e)}}function p(){U("onChange")}function i(e){var t=void 0!==e?D.parseDate(e):D.latestSelectedDateObj||(D.config.minDate&&D.config.minDate>D.now?D.config.minDate:D.config.maxDate&&D.config.maxDate"+D.config.getWeek(t)+""),U("onDayCreate",r),r}function b(e){e.focus(),"range"===D.config.mode&&A(e)}function w(e){for(var t=0=Math.abs(t))return b(s)}D.changeMonth(i),M(w(i),0)}(a,t):b(a)}function c(e,t){for(var n=(new Date(e,t,1).getDay()-D.l10n.firstDayOfWeek+7)%7,a=D.utils.getDaysInMonth((t-1+12)%12),i=D.utils.getDaysInMonth(t),o=window.document.createDocumentFragment(),r=1\n "+t.join("")+"\n \n "}function k(e,t){void 0===t&&(t=!0);var n=t?e:e-D.currentMonth;n<0&&!0===D._hidePrevMonthArrow||0D.config.maxDate.getFullYear())){var t=e,n=D.currentYear!==t;D.currentYear=t||D.currentYear,D.config.maxDate&&D.currentYear===D.config.maxDate.getFullYear()?D.currentMonth=Math.min(D.config.maxDate.getMonth(),D.currentMonth):D.config.minDate&&D.currentYear===D.config.minDate.getFullYear()&&(D.currentMonth=Math.max(D.config.minDate.getMonth(),D.currentMonth)),n&&(D.redraw(),U("onYearChange"))}}function P(e,t){void 0===t&&(t=!0);var n=D.parseDate(e,void 0,t);if(D.config.minDate&&n&&re(n,D.config.minDate,void 0!==t?t:!D.minDateHasTime)<0||D.config.maxDate&&n&&0=a.from.getTime()&&n.getTime()<=a.to.getTime())return i}return!i}function _(e){return void 0!==D.daysContainer&&(-1===e.className.indexOf("hidden")&&D.daysContainer.contains(e))}function F(e){e.stopPropagation();var t=e.target===D._input,n=I(e.target),a=D.config.allowInput,i=D.isOpen&&(!a||!t),o=D.config.inline&&t&&!a;if(13===e.keyCode&&t){if(a)return D.setDate(D._input.value,!0,e.target===D.altInput?D.config.altFormat:D.config.dateFormat),e.target.blur();D.open()}else if(n||i||o){var r=!!D.timeContainer&&D.timeContainer.contains(e.target);switch(e.keyCode){case 13:r?G():R(e);break;case 27:e.preventDefault(),W();break;case 8:case 46:t&&!D.config.allowInput&&(e.preventDefault(),D.clear());break;case 37:case 39:if(r)D.hourElement&&D.hourElement.focus();else if(e.preventDefault(),void 0!==D.daysContainer&&!1===D.config.allowInput){var c=39===e.keyCode?1:-1;e.ctrlKey?(k(c),M(w(1),0)):M(void 0,c)}break;case 38:case 40:e.preventDefault();var l=40===e.keyCode?1:-1;D.daysContainer?e.ctrlKey?(S(D.currentYear-l),M(w(1),0)):r||M(void 0,7*l):D.config.enableTime&&(!r&&D.hourElement&&D.hourElement.focus(),d(e),D._debouncedChange());break;case 9:e.target===D.hourElement?(e.preventDefault(),D.minuteElement.select()):e.target===D.minuteElement&&(D.secondElement||D.amPM)?(e.preventDefault(),void 0!==D.secondElement?D.secondElement.focus():void 0!==D.amPM&&D.amPM.focus()):e.target===D.secondElement&&D.amPM&&(e.preventDefault(),D.amPM.focus())}switch(e.key){case D.l10n.amPM[0].charAt(0):case D.l10n.amPM[0].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[0],m(),G());break;case D.l10n.amPM[1].charAt(0):case D.l10n.amPM[1].charAt(0).toLowerCase():void 0!==D.amPM&&e.target===D.amPM&&(D.amPM.textContent=D.l10n.amPM[1],m(),G())}U("onKeyDown",e)}}function A(o){if(1===D.selectedDates.length&&o.classList.contains("flatpickr-day")&&!o.classList.contains("disabled")){for(var r=o.dateObj.getTime(),c=D.parseDate(D.selectedDates[0],void 0,!0).getTime(),e=Math.min(r,D.selectedDates[0].getTime()),t=Math.max(r,D.selectedDates[0].getTime()),n=D.daysContainer.children,a=n[0].children[0].dateObj.getTime(),i=n[n.length-1].lastChild.dateObj.getTime(),l=!1,d=0,s=0,u=a;u=a||(cn,l=window.pageYOffset+o.top+(c?-n-2:t.offsetHeight+2);if(de(D.calendarContainer,"arrowTop",!c),de(D.calendarContainer,"arrowBottom",c),!D.config.inline){var d=window.pageXOffset+o.left,s=window.document.body.offsetWidth-o.right,u=d+a>window.document.body.offsetWidth;de(D.calendarContainer,"rightMost",u),D.config.static||(D.calendarContainer.style.top=l+"px",u?(D.calendarContainer.style.left="auto",D.calendarContainer.style.right=s+"px"):(D.calendarContainer.style.left=d+"px",D.calendarContainer.style.right="auto"))}}}function L(){D.config.noCalendar||D.isMobile||(z(),C())}function W(){D._input.focus(),-1!==window.navigator.userAgent.indexOf("MSIE")||void 0!==navigator.msMaxTouchPoints?setTimeout(D.close,0):D.close()}function R(e){e.preventDefault(),e.stopPropagation();var t=function e(t,n){return n(t)?t:t.parentNode?e(t.parentNode,n):void 0}(e.target,function(e){return e.classList&&e.classList.contains("flatpickr-day")&&!e.classList.contains("disabled")&&!e.classList.contains("notAllowed")});if(void 0!==t){var n=t,a=D.latestSelectedDateObj=new Date(n.dateObj.getTime()),i=(a.getMonth()D.currentMonth+D.config.showMonths-1)&&"range"!==D.config.mode;if(D.selectedDateElem=n,"single"===D.config.mode)D.selectedDates=[a];else if("multiple"===D.config.mode){var o=$(a);o?D.selectedDates.splice(parseInt(o),1):D.selectedDates.push(a)}else"range"===D.config.mode&&(2===D.selectedDates.length&&D.clear(!1),D.selectedDates.push(a),0!==re(a,D.selectedDates[0],!0)&&D.selectedDates.sort(function(e,t){return e.getTime()-t.getTime()}));if(m(),i){var r=D.currentYear!==a.getFullYear();D.currentYear=a.getFullYear(),D.currentMonth=a.getMonth(),r&&U("onYearChange"),U("onMonthChange")}if(z(),C(),D.config.minDate&&D.minDateHasTime&&D.config.enableTime&&0===re(a,D.config.minDate)&&g(D.config.minDate),G(),D.config.enableTime&&setTimeout(function(){return D.showTimeInput=!0},50),"range"===D.config.mode&&(1===D.selectedDates.length?A(n):z()),i||"range"===D.config.mode||1!==D.config.showMonths?D.selectedDateElem&&D.selectedDateElem.focus():b(n),void 0!==D.hourElement&&setTimeout(function(){return void 0!==D.hourElement&&D.hourElement.select()},451),D.config.closeOnSelect){var c="single"===D.config.mode&&!D.config.enableTime,l="range"===D.config.mode&&2===D.selectedDates.length&&!D.config.enableTime;(c||l)&&W()}p()}}D.parseDate=oe({config:D.config,l10n:D.l10n}),D._handlers=[],D._bind=o,D._setHoursFromDate=g,D.changeMonth=k,D.changeYear=S,D.clear=function(e){void 0===e&&(e=!0);D.input.value="",void 0!==D.altInput&&(D.altInput.value="");void 0!==D.mobileInput&&(D.mobileInput.value="");D.selectedDates=[],D.latestSelectedDateObj=void 0,!(D.showTimeInput=!1)===D.config.enableTime&&(void 0!==D.config.minDate?g(D.config.minDate):l(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds));D.redraw(),e&&U("onChange")},D.close=function(){D.isOpen=!1,D.isMobile||(D.calendarContainer.classList.remove("open"),D._input.classList.remove("active"));U("onClose")},D._createElement=se,D.destroy=function(){void 0!==D.config&&U("onDestroy");for(var e=D._handlers.length;e--;){var t=D._handlers[e];t.element.removeEventListener(t.event,t.handler)}D._handlers=[],D.mobileInput?(D.mobileInput.parentNode&&D.mobileInput.parentNode.removeChild(D.mobileInput),D.mobileInput=void 0):D.calendarContainer&&D.calendarContainer.parentNode&&D.calendarContainer.parentNode.removeChild(D.calendarContainer);D.altInput&&(D.input.type="text",D.altInput.parentNode&&D.altInput.parentNode.removeChild(D.altInput),delete D.altInput);D.input&&(D.input.type=D.input._type,D.input.classList.remove("flatpickr-input"),D.input.removeAttribute("readonly"),D.input.value="");["_showTimeInput","latestSelectedDateObj","_hideNextMonthArrow","_hidePrevMonthArrow","__hideNextMonthArrow","__hidePrevMonthArrow","isMobile","isOpen","selectedDateElem","minDateHasTime","maxDateHasTime","days","daysContainer","_input","_positionElement","innerContainer","rContainer","monthNav","todayDateElem","calendarContainer","weekdayContainer","prevMonthNav","nextMonthNav","currentMonthElement","currentYearElement","navigationCurrentMonth","selectedDateElem","config"].forEach(function(e){try{delete D[e]}catch(e){}})},D.isEnabled=P,D.jumpToDate=i,D.open=function(e,t){void 0===t&&(t=D._input);if(!0===D.isMobile)return e&&(e.preventDefault(),e.target&&e.target.blur()),setTimeout(function(){void 0!==D.mobileInput&&D.mobileInput.click()},0),void U("onOpen");if(D._input.disabled||D.config.inline)return;var n=D.isOpen;D.isOpen=!0,n||(D.calendarContainer.classList.add("open"),D._input.classList.add("active"),U("onOpen"),H(t));!0===D.config.enableTime&&!0===D.config.noCalendar&&(0===D.selectedDates.length&&(D.setDate(void 0!==D.config.minDate?new Date(D.config.minDate.getTime()):(new Date).setHours(D.config.defaultHour,D.config.defaultMinute,D.config.defaultSeconds,0),!1),m(),G()),setTimeout(function(){return D.hourElement.select()},50))},D.redraw=L,D.set=function(e,t){null!==e&&"object"==typeof e?Object.assign(D.config,e):(D.config[e]=t,void 0!==J[e]&&J[e].forEach(function(e){return e()}));D.redraw(),i()},D.setDate=function(e,t,n){void 0===t&&(t=!1);void 0===n&&(n=D.config.dateFormat);if(0!==e&&!e)return D.clear(t);K(e,n),D.showTimeInput=0D.config.maxDate.getMonth():D.currentYear>D.config.maxDate.getFullYear()))}function G(e){if(void 0===e&&(e=!0),0===D.selectedDates.length)return D.clear(e);void 0!==D.mobileInput&&D.mobileFormatStr&&(D.mobileInput.value=void 0!==D.latestSelectedDateObj?D.formatDate(D.latestSelectedDateObj,D.mobileFormatStr):"");var t="range"!==D.config.mode?D.config.conjunction:D.l10n.rangeSeparator;D.input.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.dateFormat)}).join(t),void 0!==D.altInput&&(D.altInput.value=D.selectedDates.map(function(e){return D.formatDate(e,D.config.altFormat)}).join(t)),!1!==e&&U("onValueUpdate")}function V(e){var t=D.prevMonthNav.contains(e.target),n=D.nextMonthNav.contains(e.target);t||n?k(t?-1:1):0<=D.yearElements.indexOf(e.target)?(e.preventDefault(),e.target.select()):e.target.classList.contains("arrowUp")?D.changeYear(D.currentYear+1):e.target.classList.contains("arrowDown")&&D.changeYear(D.currentYear-1)}return function(){D.element=D.input=s,D.isOpen=!1,function(){var e=["wrap","weekNumbers","allowInput","clickOpens","time_24hr","enableTime","noCalendar","altInput","shorthandCurrentMonth","inline","static","enableSeconds","disableMobile"],t=["onChange","onClose","onDayCreate","onDestroy","onKeyDown","onMonthChange","onOpen","onParseConfig","onReady","onValueUpdate","onYearChange","onPreCalendarPosition"],n=Object.assign({},u,JSON.parse(JSON.stringify(s.dataset||{}))),a={};D.config.parseDate=n.parseDate,D.config.formatDate=n.formatDate,Object.defineProperty(D.config,"enable",{get:function(){return D.config._enable},set:function(e){D.config._enable=B(e)}}),Object.defineProperty(D.config,"disable",{get:function(){return D.config._disable},set:function(e){D.config._disable=B(e)}}),!n.dateFormat&&n.enableTime&&(a.dateFormat=n.noCalendar?"H:i"+(n.enableSeconds?":S":""):ge.defaultConfig.dateFormat+" H:i"+(n.enableSeconds?":S":"")),n.altInput&&n.enableTime&&!n.altFormat&&(a.altFormat=n.noCalendar?"h:i"+(n.enableSeconds?":S K":" K"):ge.defaultConfig.altFormat+" h:i"+(n.enableSeconds?":S":"")+" K"),Object.defineProperty(D.config,"minDate",{get:function(){return D.config._minDate},set:j("min")}),Object.defineProperty(D.config,"maxDate",{get:function(){return D.config._maxDate},set:j("max")});var i=function(t){return function(e){D.config["min"===t?"_minTime":"_maxTime"]=D.parseDate(e,"H:i")}};Object.defineProperty(D.config,"minTime",{get:function(){return D.config._minTime},set:i("min")}),Object.defineProperty(D.config,"maxTime",{get:function(){return D.config._maxTime},set:i("max")}),Object.assign(D.config,a,n);for(var o=0;oD.now.getTime()?D.config.minDate:D.config.maxDate&&D.config.maxDate.getTime()SEO描述长度必须在80~160个字符之间[" + description_length + "个]"); flag = false } + var og_description = $("#meta_note").val(); + var og_description_length = get_string_length(og_description); + if (sitecode == 'jp' || sitecode == 'ru') og_description_length = parseInt(og_description_length / 2); + if (og_description_length < 80 || og_description_length > 160) { + $("#error-tops").append('
  • og:description信息备注长度必须在80~160个字符之间[' + og_description_length + '个]
    • '); + flag = false; + } var content_num = content_length; if (content_num < 1500) { $("#error-tops").append("
  • 文章字数不能少于1500字[" + content_num + "字]
    • "); @@ -286,6 +293,9 @@ function information_check() { return true } function submitForm(form) { + //国际站使用异步更新缓存 + $('#icht_async_msg_waiting').show(); + $('#icht_async_msg_success').hide(); $("#" + form).ajaxSubmit({ success: successfun, error: errorfun, @@ -300,10 +310,20 @@ function errorfun(responseText, statusText, xhr, form) { function successfun(responseText, statusText, xhr, form) { for (var key in responseText) { if (responseText[key].name == "ok") { - $.modaldialog.success(responseText[key].value) + var update_info_log = responseText[key].update_info_log; + if (update_info_log && update_info_log.async_update) { + //国际站使用异步更新缓存 + $('#icht_async_modal').modal('show'); + $.get(update_info_log.async_update,{"r": new Date().getTime()}, function() { + $('#icht_async_msg_waiting').slideUp(400); + $('#icht_async_msg_success').slideDown(400); + }); + } else { + $.modaldialog.success(responseText[key].value); + } } else { if (responseText[key].name == "ok_go") { - $.modaldialog.success('提交成功，正在跳转到下个页面...'); + $.modaldialog.success('提交成功，正在跳转到下个页面...'); setTimeout(function() { window.location.href = responseText[key].value }, @@ -489,6 +509,14 @@ function get_string_length(str) { } return realLength } +function get_string_length_site(element) { + var length = get_string_length($("#" + element).val()); + var sitecode = $("#is_sitecode").val(); + if (sitecode == "jp" || sitecode == "ru") { + length = parseInt(length / 2) + } + return length; +} function change_seo_count(element) { var length = get_string_length($("#" + element).val()); var sitecode = $("#is_sitecode").val(); @@ -508,6 +536,15 @@ function get_ajax_reviewed_list(formid, container, flag) { } $("#" + container).load(url + " #" + container, data) }; +function count_valid(element, element_text, from, to) { + if (from <= 0) { return true;} + var element_value_cnt = get_string_length_site(element) ; + if (element_value_cnt < from) { + $.modaldialog.error(element_text + "长度必须大于" + from + "个字符") + return false + } + return true; +} /* basic end*/ function mobile_friendly(refresh){ var ic_url = $("#ic_url").val(); @@ -528,6 +565,12 @@ if (json.result == 'ok'){ }); } +//弹出静态化更新窗口，并自动点击更新 +function show_cache_refresh_modal(url){ + $('#static_html_url').val(url); + updateCache($('#static_html_url').val(), 'cache_refresh_modal_msg'); + $('#cache_refresh_modal').modal('show'); +} $(document).ready(function() { diff --git a/js/kindeditor/kindeditor.js b/js/kindeditor/kindeditor.js index b6c39e8e..c138a280 100644 --- a/js/kindeditor/kindeditor.js +++ b/js/kindeditor/kindeditor.js @@ -17,7 +17,7 @@ if (!window.console) { if (!console.log) { console.log = function () {}; } -var _VERSION = '4.1.6 (2013-03-24) 20160601', +var _VERSION = '4.1.6 (2013-03-24) 20180730', _ua = navigator.userAgent.toLowerCase(), _IE = _ua.indexOf('msie') > -1 && _ua.indexOf('opera') == -1, _GECKO = _ua.indexOf('gecko') > -1 && _ua.indexOf('khtml') == -1, @@ -3207,9 +3207,9 @@ _extend(KCmd, { var thirdlink=false if (arguments[3] && arguments[3]=='1') { if(url.indexOf("www.chinahighlights.com") < 0 ){ - url='http://www.chinahighlights.com'+url; + url='https://www.chinahighlights.com'+url; } - url ='http://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002'; + url ='https://www.chinahighlights.com/redirect.asp?url='+url+'&t=78002'; thirdlink=true; }; @@ -5780,7 +5780,7 @@ _plugin('core', function(K) { html = html.replace(/class=\"MsoNormal\"/gi, ''); html = html.replace(/file\:\/\/C:/gi, ''); html = html.replace(/

    "", //文件夹管理目录 'theme' => "default", //主题 'types' => array( + //在当前上传目录下建立虚拟链接指向对应的文件夹，就可以上传编辑站点文件 +// mklink /D "C:\Dropbox\wwwroot\information-system-all_in_one\kcfinder\upload\gm\image" "C:\inetpub\wwwroot\gmsite\www\image" 'default' => '4sj4837Rjk37L', //默认站点，设置一个怎么也猜不到的后缀 'ah' => '*mime image/gif image/png image/jpeg', //这个名称就是目录名，每个站点不同 //国际站点 diff --git a/kcfinder/web.config b/kcfinder/web.config new file mode 100644 index 00000000..16569e53 --- /dev/null +++ b/kcfinder/web.config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/media/popselectpicture.php b/media/popselectpicture.php index 3982f615..9f476067 100644 --- a/media/popselectpicture.php +++ b/media/popselectpicture.php @@ -97,6 +97,7 @@ function is_remote_ip() || stripos($ip_list,'221.7.151.37')!==false || stripos($ip_list,'221.7.151.41')!==false || stripos($ip_list,'111.59.90.31')!==false + || stripos($ip_list,'180.140.114.225')!==false || stripos($ip_list,'180.140.114.208')!==false || stripos($ip_list,'::1')!==false //这个也是本地IP ){ @@ -115,7 +116,7 @@ function is_remote_ip() - + diff --git a/sureroute-test-object.html b/sureroute-test-object.html new file mode 100644 index 00000000..bb0fb2ad --- /dev/null +++ b/sureroute-test-object.html @@ -0,0 +1,105 @@ + + + + + + Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit + + + + + + +

    Lorem Ipsum

    + +

    Ipsum, Lorem

    + +
    +

    +Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam massa enim, tincidunt non hendrerit eget, malesuada et nisi. In hac habitasse platea dictumst. Praesent nec laoreet ante. Aenean tempus nisi in erat tempus tempus. Vestibulum imperdiet lobortis sapien eu tempus. Vivamus volutpat quam sed eros molestie vitae dignissim nulla ultricies. Vivamus dictum elit velit. Pellentesque pellentesque ornare ornare. Mauris vel gravida sapien. Praesent eleifend tristique ipsum nec tempor. Vestibulum cursus eleifend tellus, a egestas lectus euismod sed. +

    +

    +Duis nec massa quam. Nulla porta, enim ut consequat tincidunt, quam tortor consequat enim, eu interdum eros lorem eu turpis. Cras vestibulum orci quis felis tristique quis semper sem imperdiet. Sed mattis tincidunt risus scelerisque scelerisque. Aliquam nisl quam, bibendum quis luctus eu, sodales ut felis. Integer id turpis nisi. Phasellus mattis nulla eu odio faucibus a auctor orci tristique. Nulla ullamcorper, risus nec semper accumsan, libero lacus aliquet elit, quis lacinia metus nunc vestibulum turpis. Suspendisse vel sapien vel magna auctor aliquam. Aenean fringilla fringilla metus non imperdiet. Aliquam nisl lacus, tempus vitae commodo non, accumsan ut lectus. Nam in urna eu neque pretium aliquam. Maecenas sit amet urna lectus. Donec vitae metus enim. +

    +

    +Sed lacus nulla, faucibus eget ullamcorper ut, mollis at metus. Vivamus tortor felis, tincidunt at tristique ut, tincidunt feugiat velit. Ut euismod felis non urna luctus luctus. Integer nec urna massa. Mauris vestibulum hendrerit auctor. Morbi at tellus nec arcu scelerisque rhoncus. Phasellus facilisis interdum lorem vulputate posuere. Nullam quis felis est. Aenean metus augue, tempus non ultricies et, dapibus vel felis. Pellentesque at augue velit. Nulla erat nisi, posuere eu pellentesque id, pretium ac libero. Phasellus tincidunt sollicitudin sapien at mollis. Nullam et libero velit, nec tincidunt eros. Aliquam et sem elit. Quisque suscipit orci enim, vel aliquam nisi. Suspendisse in enim a ligula blandit volutpat in id velit. +

    +

    +Nam tempor neque nec ligula sollicitudin rhoncus. Etiam et lorem vel odio pharetra interdum. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In imperdiet nisi sed diam rutrum gravida in vel massa. Nam ullamcorper ultrices diam, vitae consequat lacus consequat consequat. Curabitur laoreet leo sed tortor fringilla nec euismod libero lobortis. Donec non enim lectus. Suspendisse potenti. In hac habitasse platea dictumst. Fusce semper auctor neque nec lobortis. Praesent vitae mauris turpis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin sed pharetra odio. Suspendisse potenti. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Duis eget odio purus, quis dapibus massa. +

    +

    +Curabitur ut dapibus eros. Donec tempor, felis ac facilisis bibendum, nisi purus pellentesque sem, sollicitudin tempor lectus nulla at mi. Maecenas quis urna ut ante pulvinar pellentesque. Duis auctor imperdiet suscipit. Pellentesque dui nulla, volutpat quis posuere a, gravida ornare augue. Proin nec felis pharetra magna pellentesque facilisis. Curabitur lacus libero, malesuada sed tincidunt ac, aliquet ut tortor. Etiam gravida lorem nulla, consectetur eleifend risus. Donec facilisis, turpis laoreet imperdiet laoreet, purus justo egestas nulla, et hendrerit leo eros at orci. Nunc vulputate mauris sit amet sapien accumsan nec euismod orci volutpat. Sed ultricies velit ut lorem venenatis in convallis tellus imperdiet. Aenean auctor ultrices est ultricies rhoncus. Phasellus non magna a leo luctus fermentum nec fermentum erat. +

    +

    + +Sed faucibus nisl quis diam mollis quis varius tortor tincidunt. Phasellus in turpis in tellus consectetur mollis. Donec a neque id metus condimentum dignissim. In hac habitasse platea dictumst. Pellentesque sem nisi, pulvinar nec sagittis vitae, lacinia non tellus. Aliquam dignissim dignissim volutpat. Pellentesque ut quam et mi tincidunt varius id vel quam. Duis consectetur elit ac ligula fringilla elementum. In elementum tellus viverra mi vehicula vitae tempus lectus laoreet. Nullam diam nibh, tincidunt vitae imperdiet a, luctus a felis. In posuere pulvinar volutpat. Pellentesque eget viverra justo. +

    +

    +Nullam nec sapien at felis molestie auctor. Sed dignissim erat eu nulla ullamcorper mattis. Curabitur felis sem, feugiat non semper ut, sollicitudin sed ipsum. Quisque cursus laoreet turpis, sit amet molestie neque consequat at. Vestibulum eu ligula quis nisl pulvinar rhoncus. Praesent faucibus, dolor in elementum ullamcorper, tellus ante mattis risus, ac imperdiet eros eros quis risus. Praesent luctus libero a diam pharetra eget placerat risus pulvinar. Donec sollicitudin pulvinar velit vel pellentesque. Quisque sagittis leo ac mauris congue adipiscing. In tempus facilisis facilisis. Aliquam erat volutpat. Suspendisse sagittis libero ipsum. +

    +

    +Aliquam at cursus ipsum. Vivamus purus mi, pretium at molestie id, dictum in quam. Proin egestas auctor iaculis. Maecenas sodales facilisis tellus eu bibendum. Vestibulum varius vehicula scelerisque. Praesent condimentum varius commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sem nisl, sagittis eu euismod non, tempor nec magna. Fusce sed auctor nisl. Phasellus porttitor sagittis est, sit amet eleifend elit dignissim et. Nam consectetur elementum elit non egestas. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum a ultricies neque. Integer hendrerit nisi id dolor porta quis venenatis lacus dignissim. In vitae fringilla magna. +

    +

    +Fusce ultrices scelerisque felis, id semper quam posuere a. Sed nec erat eget velit euismod condimentum a in enim. Maecenas bibendum aliquam tincidunt. Mauris vestibulum neque at nulla sagittis id lacinia enim fermentum. Quisque adipiscing risus nec massa auctor condimentum. Mauris venenatis lacus justo, eu varius odio. Fusce commodo luctus felis, vitae lobortis lectus facilisis id. Nunc faucibus vestibulum urna et lacinia. Cras ornare quam neque, non gravida sapien. Cras porta, diam sit amet laoreet rutrum, massa erat commodo diam, eu rhoncus nisl massa ac metus. In sem mauris, venenatis nec euismod ac, suscipit condimentum neque. Quisque pretium blandit lectus, ut aliquet neque rhoncus eu. Vivamus ultrices porttitor tincidunt. Curabitur ut ipsum non ipsum ultrices tincidunt. Integer scelerisque augue nec nisl varius tristique. Morbi condimentum rutrum sodales. Pellentesque odio mauris, porttitor ac sollicitudin in, ultrices ut diam. +

    +

    +Sed congue adipiscing orci a pellentesque. Etiam quis neque eu nulla viverra egestas. Ut ultricies dui non enim rhoncus laoreet. Nulla molestie nibh non erat venenatis gravida. Pellentesque faucibus sem sit amet risus tincidunt non ultrices diam auctor. Praesent quis libero et tellus tempor molestie. Mauris ullamcorper feugiat libero sed elementum. Donec eget nunc eget diam hendrerit pulvinar. Ut ut imperdiet enim. Vestibulum sed quam lorem. Nunc ipsum massa, venenatis eget condimentum at, ornare id ante. Vestibulum ornare volutpat tincidunt. Etiam a eros erat. Curabitur lobortis, nisi a malesuada tincidunt, nisi enim congue eros, in dictum elit odio at nunc. Nam hendrerit porta velit a viverra. +

    +

    +Etiam vel velit urna. Donec commodo aliquet magna rhoncus pretium. Donec fermentum orci in diam dictum non pulvinar mi tristique. Morbi urna libero, sagittis vel facilisis nec, ornare vitae nunc. Pellentesque laoreet mi a mi condimentum sagittis. Donec eleifend, nisi sit amet tincidunt sollicitudin, leo magna accumsan elit, at adipiscing velit lacus id purus. Aenean nunc sapien, egestas vitae pretium viverra, bibendum vel tellus. Maecenas mattis dui ac justo facilisis sollicitudin. Proin in mi ac lacus hendrerit congue ac vitae elit. Aliquam erat volutpat. In hac habitasse platea dictumst. Phasellus dapibus diam vel velit consectetur tempor. Maecenas viverra suscipit bibendum. Sed non enim neque. +

    + +

    +Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Phasellus at odio et odio volutpat egestas. Fusce non pellentesque felis. Nunc fermentum posuere sem quis egestas. Integer nec orci vel eros fringilla bibendum. Praesent placerat molestie elit at mattis. Nunc rutrum faucibus arcu non bibendum. Vestibulum at sapien sit amet sem iaculis congue. Morbi tempus, libero vitae interdum suscipit, lacus ipsum suscipit quam, non pretium nulla orci eget dui. Praesent et nisl turpis, ultricies convallis quam. In tempor urna et eros aliquet accumsan. Phasellus lobortis bibendum libero sit amet viverra. Aenean consectetur, neque eu cursus posuere, est leo molestie dui, sit amet vulputate mi erat eu tortor. Suspendisse arcu velit, porta sit amet adipiscing sed, ultrices id urna. In hendrerit iaculis massa in pretium. Vivamus eros augue, venenatis non hendrerit a, bibendum in tortor. Fusce et mauris lorem, vitae semper ligula. Nam iaculis, eros eu varius varius, orci sapien rhoncus arcu, et luctus urna lectus non quam. Donec gravida convallis justo at bibendum. Quisque non est velit, sed laoreet augue. +

    +
    + + + diff --git a/webht/controllers/demandform.php b/webht/controllers/demandform.php new file mode 100644 index 00000000..3e5b94bf --- /dev/null +++ b/webht/controllers/demandform.php @@ -0,0 +1,167 @@ +load->model('Demandform_model'); + } + + /*! + * @author LYT + * @date 2018-01-23 + * @param [type] $coli_sn 订单主表的COLI_SN + * @param integer $form_id 默认值2是0.1版本固定的 + */ + public function index($coli_sn = null, $form_id = 2) + { + header("Cache-Control: no-store"); + + // 已填则返回成功 + $is_replied = $this->Demandform_model->get_reply($coli_sn); + + $form_id = intval(trim($form_id)); + $_raw_data = $this->Demandform_model->get_form_detail($form_id); + $part = array(); + foreach ($_raw_data->formdetail as $key => $fd) { + $tmp_a = array(); + $tmp_r = array(); + foreach ($_raw_data->answer as $ka => $a) { + if ($fd->FD_id === $a->A_FD_id) { + $tmp_a[] = $a; + } + } + if ( ! empty($is_replied)) { + foreach ($is_replied as $kr => $re) { + if ($re->FD_id === $fd->FD_id) { + $tmp_r[] = $re->CRD_content; + } + } + } + $fd->reply = $tmp_r; + $fd->answer = (object) $tmp_a; + // part set + $part["part1"]["title"] = "PART 1 -- Travel Preference"; + $part["part2"]["title"] = "PART 2"; + if (intval(trim($fd->FD_section)) === 1) { + $part["part1"]["data"][] = $fd; + } + if (intval(trim($fd->FD_section)) === 2) { + $part["part2"]["data"][] = $fd; + } + } + $_raw_data->part = $part; + unset($_raw_data->formdetail); + unset($_raw_data->answer); + $_raw_data->coli = $coli_sn; + + if ( ! empty($is_replied)) { + $this->load->view('demandform/thanks', $_raw_data); + return; + } + + $this->load->view('demandform/index', $_raw_data); + return; + } + + public function form_save() + { + $all_post = $this->input->post(); + + $ret["code"] = 1; + $ret["msg"] = ""; + // 已填则返回成功 -- todo + + $check_input = array(); + foreach ($all_post["q"] as $key => $value) { + if ($value["required"] == 1 && empty($value["answer"])) { + $ret["code"] = 0; + $ret["msg"][] = $key; + } + } + if ($ret["code"] == 0) { + return $this->output->set_content_type('text/plain')->set_output(json_encode($ret)); + } + // CD_CustomerReply + $this->Demandform_model->CR_COLI_sn = trim($this->input->post("coli_sn")); + $this->Demandform_model->CR_F_id = trim($this->input->post("fid")); + $d = $a = $c = ""; + foreach ($all_post["q"] as $key => $value) { + $split_answer = null; + $class_max = 0; + if (trim($value["ismain"]) != 1) { + continue; + } + $class_max = (count($value["answer"])-1); + $split_answer = explode("=_", $value["answer"][$class_max]); + if (trim($value["qclass"]) === 'D' && ! empty($split_answer)) { + $d = (isset($split_answer) ? $split_answer[1] : "?"); + } + if (trim($value["qclass"]) === 'A' && ! empty($split_answer)) { + $a = (isset($split_answer) ? $split_answer[1] : "?"); + } + if (trim($value["qclass"]) === 'C' && ! empty($split_answer)) { + $c = (isset($split_answer) ? $split_answer[1] : "?"); + } + } + $this->Demandform_model->CR_result = $d . $a . $c; + // CD_CustomerReplyDetail + $this->Demandform_model->CRD_CR_id = $this->Demandform_model->reply_save(); + $reply_detail = array(); + foreach ($all_post["q"] as $key => $value) { + if (empty($value["atext"]) && empty($value["answer"])) { + continue; + } + $this->Demandform_model->CRD_FD_id = $value["fdid"]; + $this->Demandform_model->CRD_result = null; + $this->Demandform_model->CRD_Answer = null; + $this->Demandform_model->CRD_content = null; + + if (isset($value["answer"])) { + foreach ($value["answer"] as $ka => $va) { + $split_answer = null; + $split_answer = explode("=_", trim($value["answer"][$ka])); + $this->Demandform_model->CRD_Answer = $split_answer[0]; + $this->Demandform_model->CRD_content = (!empty($split_answer) ? ($split_answer[2]) : ""); + if ( ! empty($value["qclass"]) && ! empty($split_answer)) { + $this->Demandform_model->CRD_result = (!empty($split_answer) ? $split_answer[1] : "?"); + } + // 这里是 选择题others选项的可填入项 + $this->Demandform_model->CRD_content .= (isset($value["atext"]) ? $value["atext"] : ""); + $this->Demandform_model->replydetail_save(); + } + } else { + // 这里是填空题的输入 + $this->Demandform_model->CRD_content = $value["atext"]; + $this->Demandform_model->replydetail_save(); + } + } + return $this->output->set_content_type('text/plain')->set_output(json_encode($ret)); + } + + public function view_reply($coli) + { + $reply = $this->Demandform_model->get_reply($coli); + $reply_arr = array(); + $reply_fd_arr = array(); + foreach ($reply as $key => $r) { + $class_key = trim($r->FD_class) ? trim($r->FD_class) : "normal"; + $reply_arr["CR_result"] = $r->CR_result; + $reply_arr[$class_key]["q" . $r->FD_id][] = $r; + } + $this->load->view('demandform/reply', $reply_arr); + } + + public function converet_answer($answer) + { + $ret = ord($answer)-64; + $ret = ($ret > 3) ? 3 : $ret; + return $ret; + } + + +} diff --git a/webht/models/demandform_model.php b/webht/models/demandform_model.php new file mode 100644 index 00000000..dd80ba58 --- /dev/null +++ b/webht/models/demandform_model.php @@ -0,0 +1,119 @@ +INFO = $this->load->database('INFO', TRUE); + } + + public function get_form_detail($form_id) + { + $ret = (object) array(); + $form_sql = "SELECT top 1 * FROM CD_form WHERE f_id=$form_id " ; + $f_query = $this->INFO->query($form_sql); + $ret->form = $f_query->row(); + + $formdetail_sql = "SELECT fd.* + FROM CD_formdetail fd + WHERE fd.FD_F_id=$form_id order by FD_sort asc" ; + $fd_query = $this->INFO->query($formdetail_sql); + $ret->formdetail = $fd_query->result(); + + $answer_sql = "SELECT a.* + FROM CD_formdetail fd + INNER JOIN CD_answer a ON a.A_FD_id=fd.FD_id + WHERE fd.FD_F_id=$form_id " ; + $a_query = $this->INFO->query($answer_sql); + $ret->answer = $a_query->result(); + + return $ret; + } + + // CD_CustomerReply + public $CR_COLI_sn; + public $CR_F_id; + public $CR_result; + + public function reply_save() + { + $rsql = "INSERT INTO CD_CustomerReply ( + CR_COLI_sn + ,CR_F_id + ,CR_replytime + ,CR_result) + VALUES + (? + ,? + ,GETDATE() + ,N?)"; + // log_message('error',$this->INFO->compile_binds($rsql, + $rquery = $this->INFO->query($rsql, + array($this->CR_COLI_sn, $this->CR_F_id, $this->CR_result)); + $cr_id_q = "SELECT TOP 1 CR_id + FROM CD_CustomerReply + WHERE CR_COLI_sn=? + ORDER BY CR_replytime DESC"; + $cr_query = $this->INFO->query($cr_id_q, array($this->CR_COLI_sn)); + $cr_id_r = $cr_query->row(); + return $cr_id_r->CR_id; + } + + // CD_CustomerReplyDetail + public $CRD_FD_id; + public $CRD_Answer; + public $CRD_content; + public $CRD_result; + public $CRD_CR_id; + + public function replydetail_save() + { + $rdsql = "INSERT INTO CD_CustomerReplyDetail + (CRD_CR_id + ,CRD_FD_id + ,CRD_Answer + ,CRD_content + ,CRD_result + ) + VALUES (?,?,?,N?,?) "; + // log_message('error',$this->INFO->compile_binds($rdsql, + $rdquery = $this->INFO->query($rdsql, + array( + $this->CRD_CR_id, + $this->CRD_FD_id, + $this->CRD_Answer, + $this->CRD_content, + $this->CRD_result + ) + ); + return $this->INFO->insert_id(); + } + + public function get_reply($coli) + { + $sql = "SELECT fd.FD_id, + fd.FD_F_id, + fd.FD_section, + cr.CR_replytime, + cr.CR_COLI_sn, + cr.CR_result, + fd.FD_class, + fd.FD_ismain, + crd.CRD_result, + fd.FD_question, + crd.CRD_content + FROM CD_CustomerReply cr + INNER JOIN CD_CustomerReplyDetail crd ON crd.CRD_CR_id=cr.CR_id + INNER JOIN CD_FormDetail fd ON CRD_FD_id=FD_id + WHERE CR_COLI_sn='$coli' + ORDER BY fd.FD_section ASC,fd.FD_sort ASC + "; + $query = $this->INFO->query($sql); + + return $query->result(); + } + + + +} diff --git a/webht/third_party/dingmail/controllers/index.php b/webht/third_party/dingmail/controllers/index.php new file mode 100644 index 00000000..6b705811 --- /dev/null +++ b/webht/third_party/dingmail/controllers/index.php @@ -0,0 +1,714 @@ +load->model('ding_value_model'); + } + + public function test_cookie(){ + //https://oapi.dingtalk.com/connect/oauth2/sns_authorize?appid=dingoagxeeheunc0p95eu8&response_type=code&scope=snsapi_login&state=STATE&redirect_uri=http://www.mycht.cn/webht.php/apps/dingmail/index/test_cookie + + } + + public function index($unionid = null,$type = null){ + if($this->session->userdata('dingding_user_info') === false){ + $this->session->set_userdata('unionid', $unionid); + $this->session->set_userdata('type',$type); + $this->load->view('login'); + }else{ + if($unionid != null && $type != null){ + $user_info = $this->session->userdata('dingding_user_info'); + $data['type'] = $type; + $data['user'] = $user_info->ddu_Name; + $data['user_unionid'] = $user_info->ddu_Unionid; + if($this->ding_value_model->get_dingding_user($unionid) == null){ + echo '该用户还未登录过，请告知他登录后才能对他点赞或拍砖！
    '; + echo '有问题请联系：CYC!'; + exit; + } + $data['comment_name'] = $this->ding_value_model->get_dingding_user($unionid)->ddu_Name; + $data['comment_unionid'] = $unionid; + $data['content'] = $type; + $data['mail_identify'] = $this->ding_value_model->get_dingding_user($unionid)->ddu_Sn.'_'.time(); + $data['createtime'] = time(); + if($data['user'] == $data['comment_name']){ + echo ''; + $this->index($unionid); + }else{ + $obj = $this->ding_value_model->get_user_time($data['comment_unionid'],$data['user_unionid']); + $last_time = $obj->ddv_Createtime; + $time_diff = ($data['createtime'] - $last_time) / 3600; + if($time_diff > 3){ + $flag = $this->ding_value_model->add_value($data); + if(!$flag){ + exit($type.'失败'); + }else{ + redirect(site_url('apps/dingmail/index/index/'.$unionid)); + } + }else{ + echo ''; + $this->index($unionid); + } + } + }else{ + if($unionid == null){ + $unionid = $this->session->userdata('dingding_user_info')->ddu_Unionid; + } + $mdata['user'] = $this->ding_value_model->get_dingding_user($unionid); + $mdata['user_unionid'] = $unionid; + $mdata['like_count'] = $this->ding_value_model->count_like($unionid); + $mdata['unlike_count'] = $this->ding_value_model->count_unlike($unionid); + $mdata['whos_like'] = $this->ding_value_model->whos_like($unionid); + $mdata['whos_unlike'] = $this->ding_value_model->whos_unlike($unionid); + $mdata['all_comment'] = $this->ding_value_model->all_comment($unionid); + //print_r($this->session->userdata('dingding_user_info')); + $this->load->view('user',$mdata); + } + } + } + + //value邮件页面 + public function mail_index(){ + if($this->session->userdata('dingding_user_info') === false){ + $this->load->view('login'); + }else{ + //print_r($this->session->userdata('dingding_user_info')); + $this->load->view('mail'); + } + } + + //发送邮件 + public function send_mail(){ + if(!$this->input->post('emaillist')){ + echo -1; + return; + } + $user_info = $this->session->userdata('dingding_user_info'); + $data['mail_content'] = htmlspecialchars($this->input->post('emailcontent')); + $data['mail_fromuser'] = $user_info->ddu_Name; + $data['mail_subject'] = $this->input->post('mail_subject'); + $data['mail_touser'] = $this->input->post('emaillist'); + $data['mail_ccuser'] = $this->input->post('cs_emaillist'); + $data['mail_value_key'] = $this->input->post('whm_value_key'); + $data['mail_createtime'] = time(); + $data['mail_identify'] = $user_info->ddu_Sn . '_' . time(); + $ddm_id = $this->ding_value_model->add_mail($data); + //邮件所有人，如果是value邮件，则属于被value的人，如果不是，则属于发邮件的人 + if ($this->input->post('whum_value_user')) { + $value_user_array = explode(';', $this->input->post('whum_value_user')); + foreach ($value_user_array as $vu) { + if (!empty($vu)) { + $vudata['value_user_name'] = $vu; + $vudata['value_user_identify'] = $data['mail_identify']; + $vudata['value_user_createtime'] = $data['mail_createtime']; + $ddum_id = $this->ding_value_model->add_value_user($vudata); + } + } + } else { + $vudata['value_user_name'] = $user_info->ddu_Name; + $vudata['value_user_identify'] = $data['mail_identify']; + $vudata['value_user_createtime'] = $data['mail_createtime']; + $ddum_id = $this->ding_value_model->add_value_user($vudata); + } + + //收件人 + $tostring = ''; + $tolist_array = array(); + $nowlist_array = explode(';', $this->input->post('emaillist')); + foreach ($nowlist_array as $v) { + if($v != null){ + $tostring .= "'".$v."'".','; + } + } + $tostring = substr($tostring,0,-1); + if(!empty($tostring)){ + $tolist_array = $this->ding_value_model->all_email($tostring); + }else{ + $tolist_array = null; + } + + + //抄送 + $ccstring = ''; + $cclist_array = array(); + $ccmail_array = explode(';', $this->input->post('cs_emaillist')); + + foreach ($ccmail_array as $c) { + if($c != null){ + $ccstring .= "'".$c."'".','; + } + } + $ccstring = substr($ccstring,0,-1); + if(!empty($ccstring)){ + $cclist_array = $this->ding_value_model->all_email($ccstring); + }else{ + $cclist_array = null; + } + $mailheader = '

    FROM:'.$user_info->ddu_Name.'


    '; + $mailbody = ''; + + $fromuser = $user_info->ddu_Name; + $subject = $this->input->post('mail_subject'); + + //是否为value邮件，如果不是value邮件，不在邮件下放置点赞按钮 + if($this->input->post('whum_value_user')){ + $body = $mailheader.$this->input->post('emailcontent').$mailbody; + }else{ + $body = $mailheader.$this->input->post('emailcontent'); + } + + if (!$this->do_sendmail($fromuser, $tolist_array, $cclist_array, $subject, $body)) { + $result = 0; //"邮件发送有误: " . $mail->ErrorInfo; + } else { + //是value邮件的话，默认发送人点赞 + if ($this->input->post('whum_value_user')) { + $obj = explode(';', $this->input->post('whum_value_user')); + foreach(array_filter($obj) as $value){ + $data['comment_name'] = $value; + $data['comment_unionid'] = $this->ding_value_model->get_dingding_unionid($data['comment_name'])->ddu_Unionid; + $data['type'] = 'like'; + $data['mail_identify'] = $data['mail_identify']; + $data['user'] = $user_info->ddu_Name; + $data['user_unionid'] = $user_info->ddu_Unionid; + $data['content'] = $this->ding_value_model->get_mail($data['mail_identify'])->ddm_Content; + $data['createtime'] = time(); + $whc_id = $this->ding_value_model->add_value($data); + } + } + $result = 1; + } + echo $result; + return; + } + + //执行邮件发送功能 + public function do_sendmail($fromuser, $tolist_array, $cclist_array, $subject, $mailbody) { + $this->load->library('Phpmailer_lib'); + $mail = new PHPMailer(); + $mail->IsSMTP(); + $mail->Host = 'smtp.mxhichina.com';//smtp.sendgrid.net + $mail->Port = 25; + $mail->SMTPAuth = true; + $mail->Username = 'admin@hainatravel.com'; + $mail->Password = "Hainatravel123";//Hainatravel1234 + $mail->SMTPSecure = 'tls'; + $mail->CharSet = "utf-8"; + $mail->Encoding = "base64"; + $mail->IsHTML(true); + + + $mail->FromName = $fromuser; //收件人昵称 + $mail->From = 'admin@hainatravel.com'; //发件人 + //$mail->setFrom('zm198311@yahoo.com.cn‍', $fromuser); + + if($tolist_array != null){ + foreach ($tolist_array as $v) { + $mail->AddAddress($v->ddu_Email); //收件人 + } + } + if($cclist_array != null){ + foreach ($cclist_array as $c) { + $mail->addCC($c->ddu_Email); //抄送 + } + } + + $mail->Subject = $subject; //邮件主题 + $mail->Body = $mailbody; //邮件内容 + + if (!$mail->Send()) { + $result = $mail->ErrorInfo; + echo "邮件发送有误: " . $mail->ErrorInfo; + } else { + $result = true; + } + return $result; + } + + //钉邮群体点赞功能 + public function like($identify = null,$type = null){ + if($this->session->userdata('dingding_user_info') === false){ + $this->session->set_userdata('identify',$identify); + $this->session->set_userdata('mail_type',$type); + $this->load->view('login'); + }else{ + $user_info = $this->session->userdata('dingding_user_info'); + if(!empty($user_info)){ + $data['user'] = $user_info->ddu_Name; + if(($type == 'like' || $type == 'unlike') && $identify){ + $data['type'] = $type; + $data['mail_identify'] = $identify; + $data['user_unionid'] = $user_info->ddu_Unionid; + $has_like = $this->ding_value_model->is_liked($data); + if(!$has_like){ + $data['createtime'] = time(); + $data['content'] = $this->ding_value_model->get_mail($data['mail_identify'])->ddm_Content; + $data['comment_name'] = 'value邮件'; + $data['comment_unionid'] = $this->ding_value_model->get_mail($identify)->ddm_Sn; + //对邮件点赞 + $whc_id = $this->ding_value_model->add_value($data); + } + //对value对象点赞 + $valuedata['type'] = $type; + $valuedata['mail_identify'] = $identify; + $valuedata['user'] = $user_info->ddu_Name; + $valuedata['user_unionid'] = $user_info->ddu_Unionid; + $valuedata['createtime'] = time(); + $valuedata['content'] = $this->ding_value_model->get_mail($identify)->ddm_Content; + $obj = $this->ding_value_model->get_value($identify,$valuedata['user_unionid']); + if(!empty($obj)){ + //这里没有判空 + foreach($obj as $value){ + + $valuedata['comment_name'] = $value->ddum_Name; + $valuedata['comment_unionid'] = $value->ddu_Unionid; + $obj = $this->ding_value_model->get_user_time($valuedata['comment_unionid'],$valuedata['user_unionid'],$identify); + if($obj){ + $last_time = $obj->ddv_Createtime; + }else{ + $last_time = 0; + } + $time_diff = ($valuedata['createtime'] - $last_time) / 3600; + if($time_diff > 100000){ + $flag = $this->ding_value_model->add_value($valuedata); + + if(!$flag){ + continue; + } + + }else{ + echo ''; + } + } + //sleep(3); + //redirect(site_url('apps/dingmail/index/like/'.$identify)); + } + + } + } + $tpldata['value_mail'] = $this->ding_value_model->get_mail($identify); + $tpldata['whos_like'] = $this->ding_value_model->value_whos_like($identify); + $tpldata['whos_unlike'] = $this->ding_value_model->value_whos_unlike($identify); + $this->load->view('like',$tpldata); + } + } + + //增加评论 + public function add_comment(){ + $data = array(); + if($this->input->post('hidden_name')){ + $data['user'] = '猜猜我是谁'; + $data['user_unionid'] = 'xxxxxxx'; + $data['type'] = 'hidden_comment'; + }else{ + $data['user'] = $this->session->userdata('dingding_user_info')->ddu_Name; + $data['user_unionid'] = $this->session->userdata('dingding_user_info')->ddu_Unionid; + $data['type'] = 'comment'; + } + + $data['comment_name'] = $this->input->post('user_name'); + $data['comment_unionid'] = $this->input->post('user_unionid'); + $data['content'] = str_replace(PHP_EOL, '', $this->input->post('comment')); + + $data['createtime'] = time(); + $data['mail_identify'] = $this->input->post('user_sn').'_'.$data['createtime']; + + $obj = $this->ding_value_model->get_last_comment($data['comment_name'],$data['comment_unionid']); + + if(empty($obj)){ + $time = 0; + }else{ + $time = $obj[0]->ddv_Createtime; + } + + $tolist_array = $this->ding_value_model->all_email("'".$data['comment_name']."'"); + $difftime = time() - $time; + if($difftime / 3600 > 24){ + $this->do_sendmail($data['user'], $tolist_array, null, '今天有人评论你了哟！', '快去看看吧：http://www.mycht.cn/webht.php/apps/dingmail/index/index/'.$data['comment_unionid']); + } + + $comment_id = $this->ding_value_model->add_value($data); + + echo $comment_id; + } + + public function test(){ + $this->ding_value_model->test(); + } + + //点赞排行榜 + public function rank_person() { + if($this->session->userdata('dingding_user_info') === false){ + $this->load->view('login'); + }else{ + $data = array(); + $user_info = $this->session->userdata('dingding_user_info'); + if (!empty($user_info)) { + $data['uname'] = $user_info->ddu_Name; + } + //$data['current_user'] = $current_user; + //周榜 + $monday = strtotime('this week'); + $sunday = strtotime('last day this week +7 day'); + $data['rank_week'] = $this->ding_value_model->get_person_rank($monday, $sunday); + + //月榜 + $from_date = strtotime(date('Y-m-01', time())); + $firstday = date('Y-m-01', time()); + $to_date = strtotime("$firstday +1 month -1 day"); + $data['rank_month'] = $this->ding_value_model->get_person_rank($from_date, $to_date); + //年榜 + $year_start = strtotime(date('Y-01-01', time())); + //echo strtotime(date('2017-12-31', time())); + + //$year_start = strtotime(date('2016-01-01')); + $year_end = strtotime(date('Y-12-31', time())); + //$year_end = strtotime(date('2016-12-31')); + $data['rank_year'] = $this->ding_value_model->get_person_rank($year_start, $year_end); + //总榜 + //$data['rank_all']=$this->Outlook_model->get_person_rank(); + //每条价值观对应获得最多的人 + /* ycc，暂时不需要了 + $rank=array(); + $value_array=array('team','chengxin','customer','discovery','system'); + foreach ($value_array as $value) { + $rank[$value]=$this->Outlook_model->value_key_rank($value); + for ($i=1; $i < 5; $i++) { + $value_key=$value.$i; + $rank[$value_key]=$this->Outlook_model->value_key_rank($value_key); + } + } + $data['rank']=$rank; + */ + $this->load->view('rank_person',$data); + } + } + + //钉钉扫码登录 + public function auth_login(){ + //获取code + $code = $_REQUEST['code']; + //请求access_token,并且打印出来 + $url = 'https://oapi.dingtalk.com/sns/gettoken?appid=dingoagxeeheunc0p95eu8&appsecret=R3fhIY1zWw5wJZNWeszXg0VNpxzU5i95T4tUuboTQBEWAaQyg3mGC-ssskeyt9DY'; + $access_token = json_decode($this->get_http($url,$data = '',$method = 'GET')); + //请求接口获取persistent_code + $url_info = 'https://oapi.dingtalk.com/sns/get_persistent_code?access_token='.$access_token->access_token; + $tmp_auth_code = '{"tmp_auth_code":"'.$code.'"}'; + $info = json_decode($this->get_http($url_info,$data = $tmp_auth_code,$method = 'POST')); + //请求sns_token + $url_sns = 'https://oapi.dingtalk.com/sns/get_sns_token?access_token='.$access_token->access_token; + $sns_code = '{"openid":"'.$info->openid.'","persistent_code":"'.$info->persistent_code.'"}'; + $sns_token = json_decode($this->get_http($url_sns,$sns_code,$method = 'POST')); + //获取个人信息 + $url_person = 'https://oapi.dingtalk.com/sns/getuserinfo?sns_token='.$sns_token->sns_token; + $person = json_decode($this->get_http($url_person,$data = '',$method = 'GET')); + $unionid = $person->user_info->unionid; + $username = $person->user_info->nick; + $check_login = $this->ding_value_model->get_dingding_user($unionid); + if(!$check_login){ + $data = $this->get_user_info($unionid); + $flag = $this->ding_value_model->add_dingding_user($data['ddu_Name'],$data['ddu_Unionid'],$data['ddu_Mobile'],$data['ddu_Email'],$data['ddu_Position'],$data['ddu_Avatar'],$data['ddu_Datetime']); + if(!$flag){ + exit('新增用户失败！'); + }else{ + $user_info = $this->ding_value_model->get_dingding_user($data['ddu_Unionid']); + $this->session->set_userdata('dingding_user_info',$user_info); + if($this->session->userdata('unionid') && $this->session->userdata('type')){ + redirect(site_url('apps/dingmail/index/index/'.$this->session->userdata('unionid').'/'.$this->session->userdata('type'))); + }elseif($this->session->userdata('identify') && $this->session->userdata('mail_type')){ + redirect(site_url('apps/dingmail/index/like/'.$this->session->userdata('identify').'/'.$this->session->userdata('mail_type'))); + }else{ + redirect(site_url('apps/dingmail/index/index/'.$user_info->ddu_Unionid)); + } + } + } + $now_time = time(); + if($check_login->ddu_Datetime == null){ + $check_login->ddu_Datetime = 0; + } + $last_time = $check_login->ddu_Datetime; + $time_diff = ($now_time - $last_time) / 86400; + if($time_diff > 30){ + $data= $this->get_user_info($unionid); + $this->ding_value_model->update_dingding_user($data['ddu_Name'],$data['ddu_Unionid'],$data['ddu_Mobile'],$data['ddu_Email'],$data['ddu_Position'],$data['ddu_Avatar'],$data['ddu_Datetime']); + $check_login = $this->ding_value_model->get_dingding_user($unionid); + } + $this->session->set_userdata('dingding_user_info', $check_login); + if($this->session->userdata('unionid') && $this->session->userdata('type')){ + redirect(site_url('apps/dingmail/index/index/'.$this->session->userdata('unionid').'/'.$this->session->userdata('type'))); + }elseif($this->session->userdata('identify') && $this->session->userdata('mail_type')){ + redirect(site_url('apps/dingmail/index/like/'.$this->session->userdata('identify').'/'.$this->session->userdata('mail_type'))); + }else{ + redirect(site_url('apps/dingmail/index/index/'.$check_login->ddu_Unionid)); + } + + } + + //通过钉钉获取用户详细信息 + public function get_user_info($unionid){ + //公司的access_token. + //unionid是通过扫码获取到 + //获取公司access_token，用access_token和unionid获取userid，利用userid获取成员详细信息。 + $url_access_token = 'https://oapi.dingtalk.com/gettoken?corpid=ding48bce8fd3957c96b&corpsecret=4I_TlkOUtWQ60tUYX_447WXM5mNX41q_Q03xtZJgvBOzMPzGbNKZZz_Bsv-0B9I1'; + $company_info = json_decode($this->get_http($url_access_token,$data='',$method='GET')); + $url_unionid = 'https://oapi.dingtalk.com/user/getUseridByUnionid?access_token='.$company_info->access_token.'&unionid='.$unionid; + $userid = json_decode($this->get_http($url_unionid,$data='',$method='GET')); + $url_userid = 'https://oapi.dingtalk.com/user/get?access_token='.$company_info->access_token.'&userid='.$userid->userid; + $person_details = json_decode($this->get_http($url_userid,$data='',$method='GET')); + $data['ddu_Name'] = $person_details->name; + $data['ddu_Unionid'] = $person_details->unionid; + $data['ddu_Mobile'] = $person_details->mobile; + $data['ddu_Email'] = $person_details->orgEmail; + $data['ddu_Position'] = $person_details->position; + $data['ddu_Avatar'] = $person_details->avatar; + $data['ddu_Datetime'] = time(); + return $data; + } + + //发送请求 + public function get_http($url, $data = '', $method = 'GET') { + $curl = curl_init(); // 启动一个CURL会话 + curl_setopt($curl, CURLOPT_URL, $url); // 要访问的地址 + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0); // 对认证证书来源的检查 + curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0); // 从证书中检查SSL加密算法是否存在 + curl_setopt($curl, CURLOPT_USERAGENT, $_SERVER['HTTP_USER_AGENT']); // 模拟用户使用的浏览器 + curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1); // 使用自动跳转 + curl_setopt($curl, CURLOPT_AUTOREFERER, 1); // 自动设置Referer + if ($method == 'POST' && !empty($data)) { + curl_setopt($curl, CURLOPT_POST, 1); // 发送一个常规的Post请求 + curl_setopt($curl, CURLOPT_POSTFIELDS, $data); // Post提交的数据包 + curl_setopt($curl, CURLOPT_HTTPHEADER, array('Content-Type:application/json')); + } + curl_setopt($curl, CURLOPT_TIMEOUT, 45); // 设置超时限制防止死循环 + curl_setopt($curl, CURLOPT_HEADER, 0); // 显示返回的Header区域内容 + curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1); // 获取的信息以文件流的形式返回 + $tmpInfo = curl_exec($curl); // 执行操作 + $errno = curl_errno($curl); + if ($errno !== 0) { + return false; + echo $errno . curl_error($curl); //记录错误日志 + } + curl_close($curl); //关闭CURL会话 + return $tmpInfo; //返回数据 + } + + //自动提示 + public function get_user_list(){ + $q = $this->input->get('q'); + $str_array = explode(';', $q); + $q = end($str_array); + if (!$q) + return; + + $showcount = 1; + $tmp = $this->ding_value_model->all_email(); + foreach ($tmp as $value) { + if ($showcount > 8) + break; + if (strstr($value->ddu_Name, $q)) { + echo $value->ddu_Name . ';' . "\n"; + $showcount++; + } + } + } + + //检测是否有value + public function check_value_user() { + $value_user_array = explode(';', $this->input->post('value_user')); + foreach ($value_user_array as $vu) { + if (!empty($vu)) { + $result = $this->ding_value_model->has_user($vu); + if (empty($result)) { + echo 0; + return; + } + } + } + echo 1; + return; + } + + //退出 + public function logout(){ + $this->session->unset_userdata('dingding_user_info'); + $this->session->unset_userdata('unionid'); + $this->session->unset_userdata('type'); + $this->session->unset_userdata('identify'); + $this->session->unset_userdata('mail_type'); + $this->input->set_cookie('userdata', '', ''); + redirect(site_url('apps/dingmail/index/index/')); + } + + public function valuemail_list(){ + header("Content-type:text/html;charset=utf-8"); + $data = $this->ding_value_model->get_valuemail_list(); + for($i=0;$i时间：'.date('y-m-d',$data[$i]->ddm_Createtime).'
    '; + echo '

    标题：

    '.$data[$i]->ddm_Subject.'
    '; + echo '

    value邮件内容：

    '.htmlspecialchars_decode($data[$i]->ddm_Content).'
    '; + echo '
    '; + } + + } + + //查询那条value使用的次数最多 + public function count_valueitems(){ + //获取所有的item条目 + $obj = $this->ding_value_model->get_allvalueitems(); + //定义变量存储数据 + $data = array(); + $data['team1_cn'] = '心存谦卑，发现并欣赏他人的长处'; + $data['team2_cn'] = '人比事更重要，爱能包容一切过错'; + $data['team3_cn'] = '相信一群平凡的人，能组成一个不平凡的团队'; + $data['team4_cn'] = '人人平等，在爱里说诚实话'; + $data['team1_num'] = 0;$data['team2_num'] = 0;$data['team3_num'] = 0;$data['team4_num'] = 0; + + $data['chengxin1_cn'] = '行真善美，恨不义财'; + $data['chengxin2_cn'] = '诚实可信，说到做到，不隐藏真相'; + $data['chengxin3_cn'] = '做人一诺千金，做事全力以赴'; + $data['chengxin4_cn'] = '勇于承担责任使你更优秀'; + $data['chengxin1_num'] = 0;$data['chengxin2_num'] = 0;$data['chengxin3_num'] = 0;$data['chengxin4_num'] = 0; + + $data['customer1_cn'] = '穿客户的鞋，客户是我们最好的老师'; + $data['customer2_cn'] = '细节展现专业，多走一里路'; + $data['customer3_cn'] = '客户的独特性就是我们存在的理由'; + $data['customer4_cn'] = '不让一点瑕疵破坏客人一生中唯一的旅程，一眚能掩大德'; + $data['customer1_num'] = 0;$data['customer2_num'] = 0;$data['customer3_num'] = 0;$data['customer4_num'] = 0; + + $data['discovery1_cn'] = '好奇心，好头脑风暴'; + $data['discovery2_cn'] = '第一个行动的，失败了也光荣；行动太迟，正确的决策也可能变成错误'; + $data['discovery3_cn'] = '以往的成功经验未必是今天问题的解决方案'; + $data['discovery4_cn'] = 'Do Without，自己创造条件达到目标'; + $data['discovery1_num'] = 0;$data['discovery2_num'] = 0;$data['discovery3_num'] = 0;$data['discovery4_num'] = 0; + + foreach ($obj as $item){ + $items = explode(',',$item->ddm_value_key); + foreach($items as $value){ + if(!empty($value)){ + switch ($value){ + case 'team1': + $data['team1_num']++; + break; + case 'team2': + $data['team2_num']++; + break; + case 'team3': + $data['team3_num']++; + break; + case 'team4': + $data['team4_num']++; + break; + case 'chengxin1': + $data['chengxin1_num']++; + break; + case 'chengxin2': + $data['chengxin2_num']++; + break; + case 'chengxin3': + $data['chengxin3_num']++; + break; + case 'chengxin4': + $data['chengxin4_num']++; + break; + case 'customer1': + $data['customer1_num']++; + break; + case 'customer2': + $data['customer2_num']++; + break; + case 'customer3': + $data['customer3_num']++; + break; + case 'customer4': + $data['customer4_num']++; + break; + case 'discovery1': + $data['discovery1_num']++; + break; + case 'discovery2': + $data['discovery2_num']++; + break; + case 'discovery3': + $data['discovery3_num']++; + break; + case 'discovery4': + $data['discovery4_num']++; + break; + } + } + } + } + + //输出内容 + echo '使用条目:'.$data['team1_cn'].' | 使用次数:'.$data['team1_num'].'
    '; + echo '使用条目:'.$data['team2_cn'].' | 使用次数:'.$data['team2_num'].'
    '; + echo '使用条目:'.$data['team3_cn'].' | 使用次数:'.$data['team3_num'].'
    '; + echo '使用条目:'.$data['team4_cn'].' | 使用次数:'.$data['team4_num'].'
    '; + echo '使用条目:'.$data['chengxin1_cn'].' | 使用次数:'.$data['chengxin1_num'].'
    '; + echo '使用条目:'.$data['chengxin2_cn'].' | 使用次数:'.$data['chengxin2_num'].'
    '; + echo '使用条目:'.$data['chengxin3_cn'].' | 使用次数:'.$data['chengxin3_num'].'
    '; + echo '使用条目:'.$data['chengxin4_cn'].' | 使用次数:'.$data['chengxin4_num'].'
    '; + echo '使用条目:'.$data['customer1_cn'].' | 使用次数:'.$data['customer1_num'].'
    '; + echo '使用条目:'.$data['customer2_cn'].' | 使用次数:'.$data['customer2_num'].'
    '; + echo '使用条目:'.$data['customer3_cn'].' | 使用次数:'.$data['customer3_num'].'
    '; + echo '使用条目:'.$data['customer4_cn'].' | 使用次数:'.$data['customer4_num'].'
    '; + echo '使用条目:'.$data['discovery1_cn'].' | 使用次数:'.$data['discovery1_num'].'
    '; + echo '使用条目:'.$data['discovery2_cn'].' | 使用次数:'.$data['discovery2_num'].'
    '; + echo '使用条目:'.$data['discovery3_cn'].' | 使用次数:'.$data['discovery3_num'].'
    '; + echo '使用条目:'.$data['discovery4_cn'].' | 使用次数:'.$data['discovery4_num'].'
    '; + + } + + public function ajax_get_data(){ + header("Content-Type: text/html;charset=utf-8"); + $from_time = $this->input->get_post('from_time'); + $to_time = $this->input->get_post('to_time'); + $type = $this->input->get_post('type'); + + if($type == 'week'){ + $from_time = strtotime($from_time); + $to_time = strtotime($to_time); + }else if($type == 'month'){ + $firstday = $from_time; + $from_time = strtotime($from_time); + $to_time = strtotime("$firstday +1 month -1 day"); + }else if($type == 'year'){ + $from_time = strtotime($from_time); + $to_time = strtotime($to_time); + } + + $rank_data = $this->ding_value_model->get_person_rank($from_time, $to_time); + + $return_html = ''; + foreach($rank_data as $key=>$value){ + $return_html .= '
  • '; + $num = $key+1; + $return_html .= 'No.'.$num.' '; + $return_html .= ''.$value->ddv_Comment_Name.''; + $return_html .= ''.$value->like_count.' like
    • '; + } + print_r($return_html); + } + + public function delete_value($sn=null){ + if(empty($sn)){ + exit('传参错误'); + }else{ + $this->ding_value_model->delete_value($sn); + } + + } +} + + +?> \ No newline at end of file diff --git a/webht/third_party/dingmail/models/ding_value_model.php b/webht/third_party/dingmail/models/ding_value_model.php new file mode 100644 index 00000000..cc656095 --- /dev/null +++ b/webht/third_party/dingmail/models/ding_value_model.php @@ -0,0 +1,334 @@ +HT = $this->load->database('HT', TRUE); + } + + //扫码获取相应人的信息 + function get_dingding_user($unionid){ + $sql = "select + * + from + Dingding_User + where + ddu_Unionid = ?"; + $query = $this->HT->query($sql, array($unionid)); + if ($query->num_rows() > 0){ + $row = $query->row(); + return $row; + } + else{ + return FALSE; + } + } + + //根据姓名获取唯一unionid + public function get_dingding_unionid($name){ + $sql = "select ddu_Unionid from Dingding_User where ddu_Name = ?"; + $query = $this->HT->query($sql, array($name)); + if ($query->num_rows() > 0){ + $row = $query->row(); + return $row; + } + else{ + return FALSE; + } + } + + + //添加用户 + function add_dingding_user($name,$unionid,$mobile,$email,$position,$avatar,$time){ + $sql = "INSERT INTO Dingding_User (ddu_Name,ddu_Unionid,ddu_Mobile,ddu_Email,ddu_Position,ddu_Avatar,ddu_Datetime) VALUES (N?,?,?,?,N?,?,?)"; + $query = $this->HT->query($sql,array($name,$unionid,$mobile,$email,$position,$avatar,$time)); + if ($query){ + return TRUE; + }else{ + return FALSE; + } + } + + //添加value事件 + function add_value($data){ + $sql = "INSERT INTO Dingding_Value (ddv_Type,ddv_Name,ddv_User_Unionid,ddv_Comment_Name,ddv_Comment_Unionid,ddv_Content,ddv_Identify,ddv_Createtime) VALUES (?,N?,?,N?,?,N?,?,?)"; + $query = $this->HT->query($sql,array($data['type'],$data['user'],$data['user_unionid'],$data['comment_name'],$data['comment_unionid'],$data['content'],$data['mail_identify'],$data['createtime'])); + if($query){ + return TRUE; + }else{ + return FALSE; + } + } + + //统计like人数 + function count_like($unionid){ + $year_start = strtotime(date('Y-01-01', time())); + $year_end = strtotime(date('Y-12-31', time())); + $sql = "SELECT COUNT(*) AS count FROM Dingding_Value WHERE ddv_Comment_Unionid = ? AND ddv_Type = 'like' AND ddv_Type = 'like' and ddv_Createtime > '{$year_start}' and ddv_Createtime < '{$year_end}'"; + $query = $this->HT->query($sql,$unionid); + $row = $query->row(); + return $row; + } + + //获取like的人是那些 + function whos_like($unionid){ + $year_start = strtotime(date('Y-01-01', time())); + $year_end = strtotime(date('Y-12-31', time())); + $sql = "SELECT ddv_Name FROM Dingding_Value WHERE ddv_Comment_Unionid = ? AND ddv_Type = 'like' and ddv_Createtime > '{$year_start}' and ddv_Createtime < '{$year_end}' ORDER BY ddv_Sn DESC"; + $query = $this->HT->query($sql,$unionid); + $row = $query->result(); + return $row; + } + + //获取value点赞的人 + function value_whos_like($identify){ + $sql = "SELECT ddv_Name FROM Dingding_Value WHERE ddv_Identify = ? and ddv_Type = 'like' and ddv_Comment_Name = 'value邮件' ORDER BY ddv_Createtime DESC"; + $query = $this->HT->query($sql,$identify); + $row = $query->result(); + return $row; + } + + //获取value拍砖的人 + function value_whos_unlike($identify){ + $sql = "SELECT ddv_Name FROM Dingding_Value WHERE ddv_Identify = ? and ddv_Type = 'unlike' and ddv_Comment_Name = 'value邮件' ORDER BY ddv_Createtime DESC"; + $query = $this->HT->query($sql,$identify); + $row = $query->result(); + return $row; + } + + //根据Identify获取value邮件 + function get_mail($identify){ + $sql = "SELECT * FROM Dingding_Mail where ddm_Identify = ?"; + $query = $this->HT->query($sql, array($identify)); + if ($query->num_rows() > 0){ + $row = $query->row(); + return $row; + } + else{ + return FALSE; + } + } + + //根据Identify获取value邮件中value的人 + function get_value($identify,$user_unionid){ + $sql = "select * from Dingding_user_mail left join Dingding_User on(ddum_Name = ddu_Name) where ddum_Identify = ? and ddu_Unionid != '$user_unionid'"; + $query = $this->HT->query($sql, array($identify)); + if ($query->num_rows() > 0){ + $row = $query->result(); + return $row; + } + else{ + return FALSE; + } + } + + //统计unlike人数 + function count_unlike($unionid){ + $year_start = strtotime(date('Y-01-01', time())); + $year_end = strtotime(date('Y-12-31', time())); + $sql = "SELECT COUNT(*) AS count FROM Dingding_Value WHERE ddv_Comment_Unionid = ? AND ddv_Type = 'unlike' and ddv_Createtime > '{$year_start}' and ddv_Createtime < '{$year_end}'"; + $query = $this->HT->query($sql,$unionid); + $row = $query->row(); + return $row; + } + + //获取unlike的人是那些 + function whos_unlike($unionid){ + $year_start = strtotime(date('Y-01-01', time())); + $year_end = strtotime(date('Y-12-31', time())); + $sql = "SELECT ddv_Name FROM Dingding_Value WHERE ddv_Comment_Unionid = ? AND ddv_Type = 'unlike' and ddv_Createtime > '{$year_start}' and ddv_Createtime < '{$year_end}' ORDER BY ddv_Sn DESC"; + $query = $this->HT->query($sql,$unionid); + $row = $query->result(); + return $row; + } + + //获取所有点评了的人的列表 + function all_comment($unionid){ + $year_start = strtotime(date('Y-01-01', time())); + $year_end = strtotime(date('Y-12-31', time())); + $sql = "SELECT * + FROM Dingding_Value + left join Dingding_User on ddu_Unionid = ddv_User_Unionid + left join Dingding_Mail on ddv_Identify = ddm_Identify + where ddv_Comment_Unionid = '$unionid' + and ddv_Createtime > '{$year_start}' and ddv_Createtime < '{$year_end}' + ORDER BY ddv_Sn DESC"; + $query = $this->HT->query($sql,$unionid); + $row = $query->result(); + return $row; + } + /* + //获取所有点评了的人的列表 + function all_comment($unionid){ + $sql = "SELECT * FROM Dingding_Value WHERE ddv_Comment_Unionid = ? ORDER BY ddv_Sn DESC"; + $query = $this->HT->query($sql,$unionid); + $row = $query->result(); + return $row; + } + */ + //获取所有员工的姓名以及邮箱（钉钉邮箱） + function all_email($data = null){ + if($data){ + $where = "where ddu_Name in ($data)"; + }else{ + $where = ''; + } + $sql = "SELECT ddu_Name,ddu_Email FROM Dingding_User ".$where; + $query = $this->HT->query($sql); + $row = $query->result(); + return $row; + } + + //根据名字确定是否存在 + public function has_user($user_name){ + $sql="SELECT * FROM Dingding_User WHERE ddu_Name='$user_name' "; + $query = $this->HT->query($sql); + return $query->result(); + } + + //新增value邮件 + public function add_mail($data){ + $sql="INSERT INTO Dingding_Mail( + ddm_subject, + ddm_content, + ddm_touser, + ddm_ccuser, + ddm_fromuser, + ddm_value_key, + ddm_identify, + ddm_createtime + ) + VALUES (N?,N?,N?,N?,N?,?,?,?)"; + $this->HT->query($sql, array($data['mail_subject'],$data['mail_content'],$data['mail_touser'],$data['mail_ccuser'],$data['mail_fromuser'],$data['mail_value_key'],$data['mail_identify'],$data['mail_createtime'])); + return $this->HT->last_id('Dingding_Mail'); + } + + //新增value的名单 + public function add_value_user($data){ + $sql="INSERT INTO Dingding_User_Mail ( + ddum_name, + ddum_identify, + ddum_createtime) + VALUES (?,?,?)"; + $this->HT->query($sql, array($data['value_user_name'],$data['value_user_identify'],$data['value_user_createtime'])); + return $this->HT->last_id('webht_user_mail'); + } + + //检测是否已经点赞(仅用于value邮件点赞) + public function is_liked($data){ + $sql = "select * from Dingding_Value where ddv_Identify = ? and ddv_User_Unionid = ? and ddv_Comment_Name = 'value邮件'"; + $query = $this->HT->query($sql,array($data['mail_identify'],$data['user_unionid'])); + if($query->num_rows() >= 1){ + return true; + }else{ + return false; + } + } + + //获取用户最新一次被点赞的时间以及人 + public function get_user_time($unionid,$user_unionid,$identify=false){ + if($identify){ + $where = "and ddv_identify = '$identify'"; + }else{ + $where = ""; + } + $sql = "select ddv_Name,ddv_Createtime from Dingding_Value where ddv_Comment_Unionid = '$unionid' and ddv_User_Unionid = '$user_unionid'$where order by ddv_Createtime desc"; + $query = $this->HT->query($sql); + if($query){ + return $query->row(); + }else{ + return false; + } + } + + //获取最新一次被评论的时间 + public function get_last_comment($comment_name,$comment_unionid){ + $sql = "select + top 1 * + from + Dingding_Value + where + ddv_Comment_Name = '$comment_name' + and + ddv_Comment_Unionid = '$comment_unionid' + and + ddv_Type in ('comment','hidden_comment') + order by + ddv_Createtime desc"; + $query = $this->HT->query($sql); + $result=$query->result(); + return $result; + } + + + //获取点赞排行榜 + public function get_person_rank($from_date=false,$to_date=false){ + $datesql=""; + if ($from_date) { + $datesql=" AND ddv_Createtime BETWEEN '$from_date' AND '$to_date' "; + } + $sql="SELECT TOP 15 + ddv_Comment_Name, + ddv_Comment_Unionid, + COUNT(ddv_Comment_Name) as like_count + FROM Dingding_Value + WHERE ddv_Type='like' AND ddv_Comment_Name != 'value邮件' + $datesql + GROUP BY ddv_Comment_Name,ddv_Comment_Unionid + ORDER BY like_count DESC"; + + $query = $this->HT->query($sql); + $result=$query->result(); + return $result; + } + + //更新用户信息 + function update_dingding_user($name,$unionid,$mobile,$email,$position,$avatar,$time){ + $sql = "UPDATE Dingding_User SET + ddu_Name = '$name', + ddu_Mobile = '$mobile', + ddu_Email = '$email', + ddu_Position = '$position', + ddu_Avatar = '$avatar', + ddu_Datetime = '$time' + WHERE ddu_Unionid = '$unionid'"; + $query = $this->HT->query($sql); + if ($query){ + return true; + }else{ + return FALSE; + } + } + + //获取value邮件列表 + public function get_valuemail_list(){ + $year = strtotime(date('Y-01-01')); + $sql = "select * from Dingding_Mail where ddm_Createtime > '$year' order by ddm_Createtime desc "; + $query = $this->HT->query($sql); + return $query->result(); + + } + + //获取所有value邮件所用的价值观 + public function get_allvalueitems(){ + $sql = "select ddm_value_key from Dingding_Mail where ddm_value_key != ''"; + $query = $this->HT->query($sql); + return $query->result(); + } + + public function delete_value($sn){ + $sql = "DELETE FROM Dingding_Value WHERE ddv_Sn = '{$sn}'"; + $query = $this->HT->query($sql); + } + + public function test(){ + $sql = "delete from Dingding_Value where ddv_Sn = '9125'"; + $query = $this->HT->query($sql); + } + +} \ No newline at end of file diff --git a/webht/third_party/dingmail/views/like.php b/webht/third_party/dingmail/views/like.php new file mode 100644 index 00000000..fdde9754 --- /dev/null +++ b/webht/third_party/dingmail/views/like.php @@ -0,0 +1,212 @@ + + + + + + + HT在线平台 + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    + + + 他们都觉得很赞! + + + + ddv_Name; ?>; + +
    +
    +
    +
    +
    + + + 他们拍砖了! + + + ddv_Name; ?>; + +
    +
    +
    + +
    + +
    +
    +

    ddm_Subject;?>

    +
    ddm_Content); ?>
    + +
    + +
    + $c) { ?> +
    +

    whu_uname; ?>：

    +

    whc_content; ?>

    +

    + whc_createtime); ?> + 回复 +

    +
    + + +
    + + +
    + +
    +
    + + + + + \ No newline at end of file diff --git a/webht/third_party/dingmail/views/login.php b/webht/third_party/dingmail/views/login.php new file mode 100644 index 00000000..39421aa0 --- /dev/null +++ b/webht/third_party/dingmail/views/login.php @@ -0,0 +1,63 @@ + + + + + value系统登录 + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    + +

    Welcome

    + +     + +
    + +
    +

    IE6 isn't allowed!

    + Please use Google Chrome, Firefox, Safair, or IE7+. +
    + +
    +
    + + +
    + + + + + + diff --git a/webht/third_party/dingmail/views/mail.php b/webht/third_party/dingmail/views/mail.php new file mode 100644 index 00000000..cbcbdef3 --- /dev/null +++ b/webht/third_party/dingmail/views/mail.php @@ -0,0 +1,552 @@ + + + + + + + HT在线平台 + + + + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    + +
    +
    +
    + + + + +
    +
    +
    + + + + +
    +
    +
    +
    +
    + + +
    + +
    + + + +
    +
    +
    +
    + + + + + + + + \ No newline at end of file diff --git a/webht/third_party/dingmail/views/rank_person.php b/webht/third_party/dingmail/views/rank_person.php new file mode 100644 index 00000000..e1a89a0f --- /dev/null +++ b/webht/third_party/dingmail/views/rank_person.php @@ -0,0 +1,251 @@ + + + + + + + HT在线平台 + + + + + + + + + + + + + + + + + +
    +
    +
    +
    +

    个人获赞排行榜

    +
    +
    +
    +
    +

    周榜

    +
    +
    +
    + +
    +
    +
    +
    +
    +

    月榜

    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +

    年榜

    +
    + +
    +
    + +
    +
    +
    + +
    + + + \ No newline at end of file diff --git a/webht/third_party/dingmail/views/user.php b/webht/third_party/dingmail/views/user.php new file mode 100644 index 00000000..3364dc35 --- /dev/null +++ b/webht/third_party/dingmail/views/user.php @@ -0,0 +1,258 @@ + + + + + + + HT在线平台 + + + + + + + + + + + + + + + +
    +
    +
    +
    +
    +
    +
    + ddu_Avatar)){?> + + + 请退出后再次扫码登录，将展示你的钉钉头像 + +
    +
    +

    ddu_Name?>

    +
    + + count;?>
    + 赞 +     +
    +
    + + count;?>
    + 板砖 +     +
    +

    +
    +
    +
    +
    +
    +
    +
    + + + 他们都觉得很赞! + + + ddv_Name; ?>; + +
    +
    +
    +
    +
    + + + 他们拍砖了! + + + ddv_Name; ?>; + +
    +
    +
    + session->userdata('dingding_user_info')->ddu_Name == $user->ddu_Name ){ ?> +
    +
    + + + 个人邮件签名设置! + +
    + + + + + + + + + +
    +
    +

    钉邮签名没有更新成功的同学请看这里：

    +

    拖动鼠标选中上方的三个按钮(在按钮下方鼠标左键三击试试)，然后按下Ctrl+C键进行复制到自己的outlook签名里即可。

    温馨提示：不能直接用鼠标右键功能进行复制

    +
    +
    +
    + +
    + +
    +
    + +
    +
    +

    大家好，我是ddu_Name; ?>,欢迎留言......

    +
    + +
    +
    +
    + + + +
    + + +
    +
    +
    +
    + +
    + $value){?> +
    +

    + ddu_Avatar){?> + + + ddv_Type == 'hidden_comment'){ + echo $value->ddv_Name; + }else{?> + ddv_Name?> + +

    + ddv_Content == 'like' || $value->ddv_Content == 'unlike' ){ ?> +

    对你点了一个ddv_Content?>

    + ddv_Type == 'comment' || $value->ddv_Type == 'hidden_comment'){?> +

    ddv_Content?>

    + +

    ddv_Type.'+1'.'
    ';echo $value->ddm_Subject; ?>

    查看更多 + +

    + ddv_Createtime)?> +

    +
    + + +
    + +
    +
    +
    + + + + \ No newline at end of file diff --git a/webht/third_party/messagecenter/controllers/index.php b/webht/third_party/messagecenter/controllers/index.php new file mode 100644 index 00000000..2ac45867 --- /dev/null +++ b/webht/third_party/messagecenter/controllers/index.php @@ -0,0 +1,183 @@ +load->helper('message'); + $this->key = '3d15821171548bf7d0a93afab66e797b'; + $this->sendsms = 'https://yun.tim.qq.com/v5/tlssmssvr/sendsms'; + } + + public function test(){ + echo phpinfo(); + /*try { + echo '1'; + } finally { + echo '2'; + }*/ + } + + public function index(){ + $this->load->view('n-header'); + $this->load->view('message_index'); + } + + //新建短信模板 + public function add_templete(){ + $templete = htmlspecialchars($this->input->post('templete')); + $title = $this->input->post('title'); + + if(empty($templete)){ + header("HTTP/1.1 404 Not Found"); + exit('{"status":"404","reason":"传参为空！"}'); + } + + if(empty($title)){ + $title = 'trippset'.rand(1,100); + } + + $random = rand(1000,9999); + $time = time(); + $sig = 'appkey='.$this->key.'&random='.$random.'&time='.$time; + $sig = hash("sha256", $sig); + + $post_str = '{ + "remark": "", + "sig": "'.$sig.'", + "text": "'.$templete.'", + "time": '.$time.', + "title": "'.$title.'", + "type": 1 + }'; + + $url = 'https://yun.tim.qq.com/v5/tlssmssvr/add_template?sdkappid=1400082793&random='.$random; + + $back_json = sms_post($url,$post_str,'POST'); + $back_data = json_decode($back_json); + print_r($back_data); + + } + + //查询短信模板状态 + public function search_templete_status(){ + $random = rand(1000,9999); + $time = time(); + $sig = 'appkey='.$this->key.'&random='.$random.'&time='.$time; + $sig = hash("sha256", $sig); + + $post_str = '{ + "sig": "'.$sig.'", + "time": '.$time.', + "tpl_page": { + "max": 10, + "offset": 0 + } + }'; + + $url = 'https://yun.tim.qq.com/v5/tlssmssvr/get_template?sdkappid=1400082793&random='.$random; + $back_json = sms_post($url,$post_str,'POST'); + $back_data = json_decode($back_json); + print_r($back_data); + } + + //短信模板更新 + public function update_templete($id,$title){ + $contents = "Hi {1}, your guide on {2} is {3}, （local）mobile is {4}. He/she'll call you at the hotel, or leave a message tonight. You can find more info by inputting booking No. {5} at https://www.trippest.com/track-your-trip. Wish you a wonderful day with Trippest!"; + $random = rand(1000,9999); + $time = time(); + $sig = 'appkey='.$this->key.'&random='.$random.'&time='.$time; + $sig = hash("sha256", $sig); + + $post_str = '{ + "sig": "'.$sig.'", + "text": "'.$contents.'", + "time": '.$time.', + "title": "'.$title.'", + "tpl_id": '.$id.', + "type": 0 + }'; + + $url = 'https://yun.tim.qq.com/v5/tlssmssvr/mod_template?sdkappid=1400082793&random='.$random; + $back_json = sms_post($url,$post_str,'POST'); + $back_data = json_decode($back_json); + print_r($back_data); + } + + //删除模板 + public function delete_templete(){ + $random = rand(1000,9999); + $time = time(); + $sig = 'appkey='.$this->key.'&random='.$random.'&time='.$time; + $sig = hash("sha256", $sig); + + $post_str = '{ + "sig": "'.$sig.'", + "time": '.$time.', + "tpl_id": [ + 212919, + 213082 + ] + }'; + + $url = 'https://yun.tim.qq.com/v5/tlssmssvr/del_template?sdkappid=1400082793&random='.$random; + $back_json = sms_post($url,$post_str,'POST'); + $back_data = json_decode($back_json); + print_r($back_data); + } + + //发送短信 + public function send_message(){ + //接收参数 + //1-4为四个参数依次排序 字符格式不做限制 + $one = $this->input->post('one'); + $two = $this->input->post('two'); + $three = $this->input->post('three'); + $four = $this->input->post('four'); + $five = $this->input->post('five'); + //手机号 * 必填 + $phone = $this->input->post('phone'); + //区号 * 必填 + $nation_code = $this->input->post('nation_code'); + + if(empty($phone) || empty($nation_code)){ + header("HTTP/1.1 404 Not Found"); + exit('{"status":"404","reason":"传参为空！"}'); + } + + //构造发送短信的报文 + $random = rand(1000,9999); + $time = time(); + $sig = 'appkey='.$this->key.'&random='.$random.'&time='.$time.'&mobile='.$phone; + $sig = hash("sha256", $sig); + $mysign = '[ChinaHighlights]'; + + if($nation_code == 86){ + $mysign = '【桂林海纳国旅】'; + } + + $post_str = '{ + "ext": "", + "extend": "", + "msg": "Hi '.$one.', your guide on '.$two.' is '.$three.', (local) mobile is '.$four.'. He/she\'ll call you at the hotel, or leave a message tonight. You can find more info by inputting booking No. '.$five.' at https://www.trippest.com/track-your-trip. Wish you a wonderful day with Trippest!", + "sig": "'.$sig.'", + "tel": { + "mobile": "'.$phone.'", + "nationcode": "'.$nation_code.'" + }, + "time": '.$time.', + "type": 0 + }'; + + $url = 'https://yun.tim.qq.com/v5/tlssmssvr/sendsms?sdkappid=1400082793&random='.$random; + $back_json = sms_post($url,$post_str,'POST'); + $back_data = json_decode($back_json); + print_r($back_json); + } + +} + + +?> \ No newline at end of file diff --git a/webht/third_party/messagecenter/helpers/message_helper.php b/webht/third_party/messagecenter/helpers/message_helper.php new file mode 100644 index 00000000..8634dd43 --- /dev/null +++ b/webht/third_party/messagecenter/helpers/message_helper.php @@ -0,0 +1,31 @@ + +
    + +
    + +
    +
    +
    +

    短信发送中心

    +

    版本1.0

    +

    可以正常添加模板，但是只有一个模板可以发送

    +
    +
    + +
    +
    +

    模板示例：Hi {1}, your guide on {2} is {3}, （local）mobile is {4}. He/she'll call you at the hotel, or leave a message tonight. You can find more info by inputting booking No. {5} at https://www.trippest.com/track-your-trip. Wish you a wonderful day with Trippest!

    + + +
    + +
    +
    + +
    +

    模板示例：Hi {1}, your guide on {2} is {3}, （local）mobile is {4}. He/she'll call you at the hotel, or leave a message tonight. You can find more info by inputting booking No {5} at https://www.trippest.com/track-your-trip. Wish you a wonderful day with Trippest!

    +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    +
    +
    \ No newline at end of file diff --git a/webht/third_party/ordersfrom/controllers/index.php b/webht/third_party/ordersfrom/controllers/index.php new file mode 100644 index 00000000..c70cb925 --- /dev/null +++ b/webht/third_party/ordersfrom/controllers/index.php @@ -0,0 +1,81 @@ +load->model('ordersfrom_model'); + } + + public function index(){ + $data = array(); + $data['startime'] = $this->input->get_post('startime'); + $data['endtime'] = $this->input->get_post('endtime'); + $data['webcode'] = $this->input->get_post('webcode'); + $data['total_nums'] = 0; + + if($data['startime'] && $data['endtime'] && $data['webcode']){ + $all_orders = $this->ordersfrom_model->get_all_orders($data['startime'],$data['endtime'],$data['webcode']); + $data['total_nums'] = count($all_orders); + $data['orders'] = $this->group_order_arr($all_orders); + }else{ + $data['orders'] = null; + } + $this->load->view('index',$data); + } + + function group_order_arr($all_orders){ + $data = array(); + $num = 0; + foreach ($all_orders as $item){ + preg_match('/(https|http):[\/]{2}[a-z]+[.]{1}[a-z\d\-]+[.a-z\d-\/.htm]*/',$item->COLI_OrderDetailText,$matches); + if(!empty($matches[0])){ + if(isset($data[$matches[0]])){ + $data[$matches[0]]['num'] +=1; + array_push($data[$matches[0]]['order'],$item->coli_id); + }else{ + $data[$matches[0]] = array(); + $data[$matches[0]]['num'] = 1; + $data[$matches[0]]['order'] = array(); + array_push($data[$matches[0]]['order'],$item->coli_id); + } + } + } + + return $this->array_sort($data,'num','desc'); + } + + function array_sort($arr,$keys,$type='asc'){ + $keysvalue = $new_array = array(); + foreach ($arr as $k=>$v){ + $keysvalue[$k] = $v[$keys]; + } + if($type == 'asc'){ + asort($keysvalue); + }else{ + arsort($keysvalue); + } + reset($keysvalue); + foreach ($keysvalue as $k=>$v){ + $new_array[$k] = $arr[$k]; + } + return $new_array; + } + + public function count_ah_orders(){ + $data = array(); + $ah_product_obj = $this->ordersfrom_model->ah_productions(); + foreach($ah_product_obj as $item){ + $data[$item->cli_no] = array(); + $orders_arr = $this->ordersfrom_model->get_orders($item->cli_no); + $data[$item->cli_no] = $orders_arr; + } + $mdata['orders'] = $data; + $this->load->view('ah_orders',$mdata); + } +} + + +?> \ No newline at end of file diff --git a/webht/third_party/ordersfrom/models/ordersfrom_model.php b/webht/third_party/ordersfrom/models/ordersfrom_model.php new file mode 100644 index 00000000..e09daa1a --- /dev/null +++ b/webht/third_party/ordersfrom/models/ordersfrom_model.php @@ -0,0 +1,45 @@ +HT = $this->load->database('HT', TRUE); + } + + public function get_all_orders($fromtime,$totime,$website){ + $sql = "select + COLI_OrderDetailText,coli_id + from + ConfirmLineInfo + where + COLI_WebCode = ? + and + COLI_ApplyDate > ? + and + COLI_ApplyDate < ? + and + DeleteFlag = 0 + and + COLI_OrderDetailText like '%https:%' + "; + $query = $this->HT->query($sql,array($website,$fromtime,$totime)); + return $query->result(); + } + + public function ah_productions(){ + $sql = "select cli_no from CustomerLineInfo WHERE CLI_DEI_SN = '28' AND DeleteFlag = '0'"; + $query = $this->HT->query($sql); + return $query->result(); + } + + public function get_orders($productsn){ + $sql = "select COLI_ID from ConfirmLineInfo where COLI_WebCode = 'AH' and DeleteFlag = 0 and COLI_OrderDetailText like '%{$productsn}%'"; + $query = $this->HT->query($sql); + return $query->result(); + } +} \ No newline at end of file diff --git a/webht/third_party/ordersfrom/views/ah_orders.php b/webht/third_party/ordersfrom/views/ah_orders.php new file mode 100644 index 00000000..44959118 --- /dev/null +++ b/webht/third_party/ordersfrom/views/ah_orders.php @@ -0,0 +1,62 @@ + + + + + + + 订单来源页面搜索 + + + + + + + + + + +

    AH订单统计(按线路代号)

    + + + + + + + $items){ + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + } + echo $table_body; + ?> +
    线路代号订单数量具体订单号
    '.$key.''.count($items).''; + $orders_num = 0; + foreach ($items as $value){ + $orders_num++; + if($orders_num == count($items)){ + $table_body .= $value->COLI_ID; + }else{ + $table_body .= $value->COLI_ID.'、'; + } + } + + $table_body .= '
    + + + + \ No newline at end of file diff --git a/webht/third_party/ordersfrom/views/index.php b/webht/third_party/ordersfrom/views/index.php new file mode 100644 index 00000000..840358bd --- /dev/null +++ b/webht/third_party/ordersfrom/views/index.php @@ -0,0 +1,120 @@ + + + + + + + 订单来源页面搜索 + + + + + + + + + + + +
    +

    订单来源页面查询

    +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    + +
    +
    +
    +
    + + +
    +
    +

    统计分组结果

    +

    总订单数:

    +
    +
    + + + + + + + $items){ + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + $table_body .= ''; + } + echo $table_body; + ?> +
    订单来源订单数量具体订单号
    '.$key.''.$items['num'].''; + $orders_num = 0; + foreach ($items['order'] as $value){ + $orders_num++; + if($orders_num == count($items['order'])){ + $table_body .= $value; + }else{ + $table_body .= $value.'、'; + } + } + + $table_body .= '
    +
    +
    + + + \ No newline at end of file diff --git a/webht/third_party/pay/config/paypal.php b/webht/third_party/pay/config/paypal.php index 335d05d8..f0a6743a 100644 --- a/webht/third_party/pay/config/paypal.php +++ b/webht/third_party/pay/config/paypal.php @@ -1,4 +1,6 @@ input->post(); $asyns_resp = $this->check($resp_arr); // 未得到结果 @@ -99,29 +100,56 @@ class AlipayTradeService extends CI_Controller echo "failed"; return; } - if (true === $this->if_note_exists($asyns_resp->data->trade_no)) { + if ( isset($asyns_resp->data->refund_fee) && true === $this->if_note_exists($asyns_resp->data->out_biz_no) ) { echo "success"; return; + } else if ( ! isset($asyns_resp->data->refund_fee) && true === $this->if_note_exists($asyns_resp->data->trade_no)) { + echo "success"; + return; + } + $notify_type = "pay"; + if (isset($asyns_resp->data->refund_fee)) { + $notify_type = "refund"; } $code = isset($asyns_resp->data->code) ? strval($asyns_resp->data->code) : NULL ; $buyer = isset($asyns_resp->data->buyer_logon_id) ? strval($asyns_resp->data->buyer_logon_id) : NULL ; - if (strcmp(strval($asyns_resp->data->trade_status), "TRADE_SUCCESS") == 0) { - $this->Alipay_note_model->save_alipay( - strval($asyns_resp->data->trade_no) - ,strval($asyns_resp->data->out_trade_no) - ,"CNY" - ,strval($asyns_resp->data->total_amount) - ,NULL - ,NULL - ,strval($asyns_resp->data->gmt_create) - ,strval($asyns_resp->data->gmt_payment) - ,json_encode($asyns_resp->data) - ,strval("pay") - ,$code - ,strval($asyns_resp->data->trade_status) - ,NULL - ,$buyer - ); + if (strcmp(trim(strval($asyns_resp->data->trade_status)), "TRADE_SUCCESS") == 0 + || strcmp(trim(strval($asyns_resp->data->trade_status)), "TRADE_FINISHED") == 0) { + if ($notify_type === "pay") { + $this->Alipay_note_model->save_alipay( + strval($asyns_resp->data->trade_no) + ,strval($asyns_resp->data->out_trade_no) + ,"CNY" + ,strval($asyns_resp->data->total_amount) + ,NULL + ,NULL + ,strval($asyns_resp->data->gmt_create) + ,strval($asyns_resp->data->gmt_payment) + ,json_encode($asyns_resp->data) + ,$notify_type + ,$code + ,strval($asyns_resp->data->trade_status) + ,NULL + ,$buyer + ); + } else if ($notify_type == "refund") { + $this->Alipay_note_model->save_alipay( + strval($asyns_resp->data->out_biz_no) + ,strval($asyns_resp->data->out_trade_no) + ,"CNY" + ,"-" . strval($asyns_resp->data->refund_fee) + ,NULL + ,NULL + ,strval($asyns_resp->data->gmt_refund) + ,strval($asyns_resp->data->notify_time) + ,json_encode($asyns_resp->data) + ,$notify_type + ,$code + ,strval($asyns_resp->data->trade_status) + ,NULL + ,$buyer + ); + } // 查询payer // $this->AlipayTradeQueryContentBuilder->setTradeNo($asyns_resp->data->trade_no); // if ($asyns_resp->data->out_trade_no) { @@ -320,18 +348,18 @@ class AlipayTradeService extends CI_Controller foreach ($data['unsend_list'] as $item) { //已经发送的不处理，防止重复发送 - if ($item->ALI_sent == 'send') { + if ($item->ALI_sent == 'send' && empty($pn_txn_id)) { continue; } //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理 - if ($item->ALI_payType == 'Refunded') { + if ($item->ALI_payType == 'refund') { $this->Alipay_note_model->update_send($item->ALI_dealId, 'send'); continue; } //只处理完成状态，其他状态由陆燕处理 - if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS")) { + if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS")!==0 && strcmp(trim($item->ALI_resultMsg), "TRADE_FINISHED")!==0 ) { $this->Alipay_note_model->update_send($item->ALI_dealId, 'send'); continue; } @@ -369,11 +397,14 @@ class AlipayTradeService extends CI_Controller $this->Alipay_note_model->update_send($item->ALI_dealId, 'send'); continue; } - //添加支付信息入库 //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据 if (!empty($orderid_info)) { $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->ALI_currencyCode))); + $ssje = $item->ALI_orderAmount; + if (intval($item->ALI_stateCode)!==1) { + $ssje = $this->Alipay_model->get_ssje($item->ALI_orderAmount, $currencyCode); + } $USD_amount = $this->Alipay_model->get_USD($item->ALI_orderAmount, $currencyCode); //更新还没有填的客邮和交易号de收款记录（商务订单） if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { @@ -385,8 +416,14 @@ class AlipayTradeService extends CI_Controller // $this->Alipay_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->ALI_dealId, $ht_memo); // if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { //只修改APP组的订单状态，并且订单进度是我的订单 // $this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款 + // $this->Alipay_model->insert_biz_order_log($GAI_COLI_SN, 'BS8'); // } } else { + // 把订单状态设置为13-新订单已支付 + if (false == $this->Alipay_model->if_biz_gai_exists($item->ALI_dealId) ) { + $this->Alipay_model->update_biz_coli_state($GAI_COLI_SN, 13); + $this->Alipay_model->insert_biz_order_log($GAI_COLI_SN, 'BS13'); + } $this->Alipay_model->add_account_info( $GAI_COLI_SN, $advisor_info->COLI_ID, @@ -394,6 +431,7 @@ class AlipayTradeService extends CI_Controller $item->ALI_completeTime, $currencyCode, $USD_amount, + $ssje, $item->ALI_completeTime, $item->ALI_completeTime, $item->ALI_acquiringTime, @@ -402,17 +440,20 @@ class AlipayTradeService extends CI_Controller $item->ALI_dealId, $ht_memo ); + // 更新订单主表付款方式,防止没访问thankyou-train.asp + $this->Alipay_model->update_paymanner($GAI_COLI_SN); } } //更新还没有填的客邮和交易号de收款记录（传统订单） elseif (isset($advisor_info->order_type) && $advisor_info->order_type == 1) { $ht_memo = '交易号(自动录入):' . $item->ALI_dealId; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; - $this->Alipay_model->add_tour_account_info( + $gai_sn = $this->Alipay_model->add_tour_account_info( $GAI_COLI_SN, $item->ALI_orderAmount, $item->ALI_acquiringTime, $currencyCode, + $ssje, $item->ALI_completeTime, $item->ALI_completeTime, $item->ALI_acquiringTime, @@ -423,6 +464,8 @@ class AlipayTradeService extends CI_Controller ); //添加汉特的订单提醒 $this->Alipay_model->update_coli_introduction($GAI_COLI_SN, '已支付 ' . mb_strtoupper($item->ALI_currencyCode) . $item->ALI_orderAmount); + // 添加HT任务 + $this->Alipay_model->exec_addToTask($gai_sn); } } @@ -470,29 +513,44 @@ class AlipayTradeService extends CI_Controller $request = new AlipayTradeQueryRequest(); $request->setBizContent ( $biz_content ); - $response = $this->aopclientRequestExecute ($request,true); + $response = $this->aopclientRequestExecute ($request); $response = $response->alipay_trade_query_response; return $response; } - public function query_pay($dealId,$orderId=NULL) + public function query_pay($dealId=NULL,$orderId=NULL) { + if ($dealId === NULL) { + $dealId = $this->input->get_post('dealid'); + $dealId = trim($dealId); + } $this->AlipayTradeQueryContentBuilder->setTradeNo($dealId); if ($orderId) { $this->AlipayTradeQueryContentBuilder->setOutTradeNo($orderId); } $response = $this->Query($this->AlipayTradeQueryContentBuilder); - if ( strcmp(trim($response->code), "10000")) { - log_message('error',"Alipay query failed! error code:".$response->code."; result Msg: ".$response->msg.'; orderId:'.$response->out_trade_no.'; dealId:'.$response->trade_no."; "); - } - $html = ''; - foreach ($response as $key => $value) { - $html .= ""; - } - $html .= '
    $key$value
    '; - echo $html; - return; + return $response; + } + + /*! + * 查询退款 + * @date 2019-04-24 + * @param [type] $dealId 必须, 退款交易号.out_biz_no + * @param [type] $trade_no 必须, 原收款交易号 + */ + public function query_refund($dealId=NULL,$trade_no=NULL) + { + $this->AlipayTradeQueryContentBuilder->setTradeNo($trade_no); + $this->AlipayTradeQueryContentBuilder->setOutRequestNo($dealId); + + $biz_content=$this->AlipayTradeQueryContentBuilder->getBizContent(); + $request = new AlipayTradeFastpayRefundQueryRequest(); + $request->setBizContent ( $biz_content ); + + $response = $this->aopclientRequestExecute ($request); + // $response = $response->alipay_trade_fastpay_refund_query_response; + return $this->output->set_content_type('application/json')->set_output(json_encode($response)); } /*! @@ -510,8 +568,8 @@ class AlipayTradeService extends CI_Controller { $request = new AlipayDataDataserviceBillDownloadurlQueryRequest(); $request->setBizContent("{" . - "\"bill_type\":\"trade\"," . - "\"bill_date\":\"2017-09\"" . + "\"bill_type\":\"signcustomer\"," . + "\"bill_date\":\"2019-04-03\"" . "}"); $response = $this->aopclientRequestExecute ($request); // var_dump($response); @@ -577,6 +635,7 @@ var_dump($response->$responseNode); public function note_list() { + $this->permission->is_admin(true); $data = array(); $data["paytext"] = $this->payment_status(); $data["keywords"] = $this->input->get_post("keywords"); @@ -584,6 +643,31 @@ var_dump($response->$responseNode); empty($data['date']) ? $data['date'] = date('Y-m-d') : false; if (!empty($data['keywords'])) { $data['notelist'] = $this->Alipay_note_model->search_key($data['keywords']); + /** 手动查询通过收钱码的收款, 必须输入交易号 */ + if (empty($data['notelist'])) { + $query_pay = $this->query_pay($data["keywords"]); + if ( ! empty($query_pay) && strval($query_pay->code)==="10000" + && in_array(strval($query_pay->trade_status), array("TRADE_SUCCESS", "TRADE_FINISHED")) ) { + $pay_type = $query_pay->total_amount>0 ? "pay" : "refund"; + $new_record = $this->Alipay_note_model->save_alipay( + strval($query_pay->trade_no) + ,strval($query_pay->out_trade_no) + ,"CNY" + ,strval($query_pay->total_amount) + ,NULL + ,1 // 此处1表示通过收款码进来的, 不收手续费, 后续录入时分别处理 + ,strval($query_pay->send_pay_date) + ,strval($query_pay->send_pay_date) + ,json_encode($query_pay) + ,$pay_type + ,NULL + ,strval($query_pay->trade_status) + ,NULL + ,strval($query_pay->buyer_logon_id) + ); + $data['notelist'][] = $new_record; + } + } } else { $data['notelist'] = $this->Alipay_note_model->search_date($data['date']); } @@ -592,6 +676,7 @@ var_dump($response->$responseNode); } //失败记录列表 public function note_faillist() { + $this->permission->is_admin(true); $data = array(); $data["paytext"] = $this->payment_status(); //有关键词则不限制日期 @@ -613,6 +698,7 @@ var_dump($response->$responseNode); //获取note详情，以便后续修改各项数据 public function note_modal($pn_txn_id = false, $pn_invoice = false ,$notice_time = false) { + $this->permission->is_admin(true); $data = array(); $data['IPL_orderId'] = $pn_invoice; if (!empty($pn_txn_id)) { @@ -701,6 +787,7 @@ var_dump($response->$responseNode); return array( "WAIT_BUYER_PAY" => "Pending", "TRADE_SUCCESS" => "Payment success", + "TRADE_CLOSED" => "Payment closed", "TRADE_FINISHED" => "Payment success" ); } diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php new file mode 100644 index 00000000..bf6180b6 --- /dev/null +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -0,0 +1,391 @@ +load->helper('payment'); + $this->config->load('wxpay', true); + $this->config->load('paypal', true); + $this->load->model('Online_payment_note_model', 'note_model'); + $this->load->model('Online_payment_account_model', 'account_model'); + } + + public function index() + { + } + + public function note_list() + { + $this->permission->is_admin(true); + $data = array(); + // $data["paytext"] = $this->payment_status(); + $data["method_name"] = $this->input->get_post("method_name"); + $data["keywords"] = $this->input->get_post("keywords"); + $data["date"] = $this->input->get_post("date"); + empty($data['date']) ? $data['date'] = date('Y-m-d') : false; + if (!empty($data['keywords'])) { + $data['notelist'] = $this->note_model->search_key($data['keywords']); + } else { + $data['notelist'] = $this->note_model->search_date($data['date']); + } + + /** + * 导出记录用的记录节点 + * TODO + */ + // $data['record_flags'] = $this->note_model->list_export_record(); + + $this->load->view("payment_list",$data); + return; + } + + public function note_faillist() + { + $this->permission->is_admin(true); + $data = array(); + $data['date'] = date('Y-m-d'); + $data['notelist'] = $this->note_model->failnote(100); + $this->load->view("payment_list",$data); + return; + } + + public function send_notify($opn_id=NULL, $old_ssje=NULL) + { +log_message('error','send_notify begin ----'); +// exit(); + $data = array(); + $show_index = 0; + //优先处理指定的交易号，用于修正交易号直接发送通知 + if ( ! empty($opn_id)) { + $data['unsend_list'] = $this->note_model->get_note($opn_id); + } + // 待处理的 + if (empty($data['unsend_list'])) { + $data['unsend_list'] = $this->note_model->unsend_note(10); + } + //没有未处理的数据再查找处理失败的数据 + if (empty($data['unsend_list'])) { + $data['unsend_list'] = $this->note_model->sendfail_note(20); + } + // 开始处理 + foreach ($data['unsend_list'] as $key => $item) { + // 只处理完成状态 + if ($item->OPN_transactionResult != 'completed') { + continue; + } + if ($item->OPN_noticeType == 'Refunded') { + // 退款处理 + continue ; + } + + // 提取订单号 + $orderid_info = analysis_orderid($item->OPN_orderId); // 先用已设置过的 + if (empty($orderid_info)) { + $orderid_info = $this->method_analysis_orderid($item->OPN_accountMethod, $item->OPN_rawContent); + if (empty($orderid_info)) { + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); + continue; + } + } + $orderid_info = json_decode($orderid_info); + // TODO Trippest的订单号要特别查询 + // 填入提取到的订单号 + $this->note_model->set_invoice($item->OPN_SN, $orderid_info->orderid . '_' . $orderid_info->ordertype); + + // APP自动出票的收款 跳过 + if ($orderid_info->ordertype === 'A' && $item->OPN_noticeType === 'pay') { + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'closed'); + continue; + } + + // 开始查找订单和录入 + $handpick = empty($opn_id) ? false : true; + $advisor_info = $this->account_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); + $ssje = $this->account_model->get_ssje($item->OPN_orderAmount, mb_strtoupper($item->OPN_currency), $item->OPN_accountMethod); + $ssje = $old_ssje===NULL ? $ssje : $old_ssje; + $ht_memo = '交易号(自动录入):' . $item->OPN_transactionId; + if ( empty($advisor_info)) { + // record fail + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); + continue; + } + $COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; + $update_note_column = array(); + if ($advisor_info->order_type == 0) { + /* 商务订单 */ + if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') { + /* APP */ + $this->account_model->add_account_info_forAPP( + $COLI_SN, + $item->OPN_accountMethod, + $advisor_info->COLI_ID, + $item->OPN_orderAmount, + $item->OPN_completeTime, + mb_strtoupper($item->OPN_currency), + $ssje, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_payerName, + $item->OPN_payerEmail, + $item->OPN_transactionId, + $ht_memo + ); + if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { + //只修改APP组的订单状态，并且订单进度是我的订单 + $this->account_model->update_biz_coli_state($COLI_SN, 8); //把订单状态改为已付款 + $this->account_model->insert_biz_order_log($COLI_SN, 'BS8'); + } + } else { + /* 其他商务订单 */ + // 第一次录入收款记录时变更状态,记录日志 + if (false == $this->account_model->if_biz_gai_exists($item->OPN_transactionId) ) { + $this->account_model->update_biz_coli_state($COLI_SN, 13); + $this->account_model->insert_biz_order_log($COLI_SN, 'BS13'); + } + $this->account_model->add_account_info( + $COLI_SN, + $item->OPN_accountMethod, + $advisor_info->COLI_ID, + $item->OPN_orderAmount, + $item->OPN_completeTime, + mb_strtoupper($item->OPN_currency), + $ssje, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_payerName, + $item->OPN_payerEmail, + $item->OPN_transactionId, + $ht_memo + ); + // 更新订单主表付款方式,防止没访问thankyou-train.asp + $this->account_model->update_paymanner($COLI_SN, $item->OPN_accountMethod); + } + // 更新note + $update_note_column['OPN_accountType'] = 'B'; + $update_note_column['OPN_accountStatus'] = 'recorded'; + $update_note_column['OPN_accountTime'] = date('Y-m-d H:i:s'); + } elseif ($advisor_info->order_type == 1) { + /* 传统 */ + $gai_sn = $this->account_model->add_tour_account_info( + $COLI_SN, + $item->OPN_accountMethod, + $item->OPN_orderAmount, + $item->OPN_completeTime, + mb_strtoupper($item->OPN_currency), + $ssje, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_completeTime, + $item->OPN_payerName, + $item->OPN_payerEmail, + $item->OPN_transactionId, + $ht_memo + ); + //添加汉特的订单提醒 + $this->account_model->update_coli_introduction($COLI_SN, '已支付 ' . mb_strtoupper($item->OPN_currency) . $item->OPN_orderAmount); + // 添加HT任务 + $this->account_model->exec_addToTask($gai_sn); + // 更新note + $update_note_column['OPN_accountType'] = 'B'; + $update_note_column['OPN_accountStatus'] = 'recorded'; + $update_note_column['OPN_accountTime'] = date('Y-m-d H:i:s'); + } + // 更新note + if ( ! empty($update_note_column)) { + $where = " OPN_SN=" . $item->OPN_SN; + $this->note_model->update_note($where, $update_note_column); + } + // 邮件外联 + $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; + $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; + //没有外联信息表示订单未分配 + if (empty($opi_email) || empty($opi_firstname)) { + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'sendfail'); + continue; + } + //添加邮件发送记录 + //给外联发送通知邮件 + $fromName = !empty($item->OPN_payerName) ? $item->OPN_payerName : ''; + $fromEmail = !empty($item->OPN_payerEmail) ? $item->OPN_payerEmail : ''; + $toName = !empty($opi_firstname) ? $opi_firstname : ''; + $toEmail = !empty($opi_email) ? $opi_email : ''; + $subject = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->OPN_orderAmount . $item->OPN_currency . ' / ' . $fromName; + $body = $this->load->view('mail_advisor', $item, true); //$item->pn_memo; + $M_RelatedInfo = $item->OPN_SN; + $M_AddTime = $item->OPN_completeTime; + $M_State = 0; + $this->account_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'payment note', 'payment note'); + //添加邮件发送记录 end + // 2. 给客人发邮件,通知账单 todo ?? 是否需要 + + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'send'); + + //显示处理记录 + if (empty($opn_id)) { + echo ++$show_index . ' ' . $item->OPN_transactionId . '
    '; + } + + } + return; + // return $this->output->set_content_type('application/json')->set_output(json_encode($data)); + } + + /** 支付方式参数对应的配置文件名 */ + /** @Deprecated */ + public function method_name($name) + { + $config_name = 'paypal'; + switch ($name) { + case 'paypal': + $config_name = 'paypal'; + break; + case 'weixin': + $config_name = 'wxpay'; + break; + case 'ipaylinks': + $config_name = 'iPayLinks'; + break; + case 'alipay': + $config_name = 'alipay'; + break; + + default: + # code... + break; + } + return $config_name; + } + + private function method_analysis_orderid($name, $raw_content) + { + $content_obj = json_decode($raw_content); + $orderid_info = array(); + switch (strval($name)) { + case '15002': + case '15010': // paypal + $orderid_info = analysis_orderid($content_obj->invoice); + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->transaction_subject) : NULL; + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->custom) : NULL; + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->item_name) : NULL; + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->item_name1) : NULL; + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->item_number) : NULL; + empty($orderid_info) ? $orderid_info = analysis_orderid($content_obj->item_number1) : NULL; + break; + + case '15016': // wxpay + $orderid_info = analysis_orderid($content_obj->out_trade_no); + break; + // TODO + case '15018': // iPaylinks + break; + case '15015': // alipay + break; + + default: + # code... + break; + } + return $orderid_info; + } + + public function convert_send_status() + { + # code... + } + + public function gai_modal($pn_id = null, $neworder=null) + { + $this->permission->is_admin(true); + $data = array(); + $note = $this->note_model->get_note($pn_id); + $data['note'] = $note[0]; + $data['order_info'] = NULL; + $pn_invoice = $data['note']->OPN_orderId ? $data['note']->OPN_orderId : $data['note']->OPN_rawOrderId; + $pn_txn_id = $data['note']->OPN_transactionId; + $orderid_info = analysis_orderid($pn_invoice); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + $data['order_info'] = $this->account_model->get_order($orderid_info->orderid, true, $orderid_info->ordertype); + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->account_model->get_money_t($pn_txn_id); + } elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP') { + $data['gai_info'] = $this->account_model->get_money_b($pn_txn_id); + } + } + $data['old_order'] = $pn_invoice; + $data['new_order'] = $neworder; + if ($neworder !== null ) { + $neworder_id = analysis_orderid($neworder); + $neworder_id = json_decode($neworder_id); + if ( ! empty($neworder_id)) { + $data['order_info'] = $this->account_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype); + } + } + echo json_encode($this->load->view('payment_gai_setting', $data, true)); + } + + public function gai_modal_save() + { + $data = array(); + $old_ssje = NULL; + $pn_txn_id = $this->input->post('pn_txn_id'); + $pn_id = $this->input->post('pn_id'); + $neworder = $this->input->post('pn_invoice'); + + $note = $this->note_model->get_note($pn_id); + $data['note'] = $note[0]; + $orderid_info = analysis_orderid($data['note']->OPN_orderId); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->account_model->get_money_t($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->account_model->delete_money_t($pn_txn_id); + } + } elseif ($orderid_info->ordertype === 'B' || $orderid_info->ordertype === 'TP') { + $data['gai_info'] = $this->account_model->get_money_b($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->account_model->delete_money_b($pn_txn_id); + } + } + } + + if (!empty($pn_txn_id) && !empty($neworder)) { + $orderid_info = analysis_orderid($neworder); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + $advisor_info = $this->account_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); + if (!empty($advisor_info)) { + $this->note_model->set_invoice($data['note']->OPN_SN, $neworder); + $this->send_notify($data['note']->OPN_SN, $old_ssje); + echo json_encode('修改成功！'); + return true; + } + } + } + echo json_encode('没找到数据！'); + return; + } + + public function close_gai($opn_id) + { + $data = array(); + $data['note'] = $this->note_model->get_note($opn_id); + if (!empty($data['note'])) { + $this->note_model->update_send($opn_id, $data['note'][0]->OPN_transactionId, 'closed'); + echo json_encode('该收款记录已经忽略！'); + return true; + } + echo json_encode('没找到数据！'); + return; + } + +} + diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php new file mode 100644 index 00000000..1f39a0ed --- /dev/null +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -0,0 +1,156 @@ +load->helper('payment'); + $this->config->load('wxpay', true); + $this->load->model('Online_payment_note_model', 'note_model'); + $this->load->model('Online_payment_account_model', 'account_model'); + } + + public function index() + { + + } + + public function notify($site='cht') + { + error_reporting(0); +log_message('error','notify begin ----'); + $response['return_code'] = 'FAIL'; + $response['return_msg'] = ''; + $GLOBALS['__WX_SITE_NAME__'] = $site; + $this->wx_site_config = $this->config->item($GLOBALS['__WX_SITE_NAME__'], 'wxpay'); + $raw_post_data = file_get_contents('php://input'); +// log_message('error',var_export($raw_post_data, 1)); + if (empty($raw_post_data) ){ + # 如果没有数据，直接返回失败 + return $this->response_to_wx($response); + } + //获取通知的数据 + $xml = $raw_post_data; + $xml_arr = from_xml($xml); +// log_message('error',var_export($xml_arr, 1)); + if ($this->check_sign($xml_arr) !== true) { + return $this->response_to_wx($response); + } + // 入库保存异步通知 + if ( strval($xml_arr['result_code']) !== "SUCCESS" ) { + $response['return_code'] = 'SUCCESS'; + $response['return_msg'] = 'OK'; + } else { + $xml_arr['total_fee'] = bcdiv($xml_arr['total_fee'], $this->config->item('currency_unit', 'wxpay')); + $ssje = $this->account_model->get_ssje($xml_arr['total_fee'], $xml_arr['fee_type'], $this->config->item('currency_unit', 'wxpay')); + $save_column = array(); + $save_column['OPN_transactionId'] = $xml_arr['transaction_id']; + $save_column['OPN_orderId'] = $xml_arr['out_trade_no']; + $save_column['OPN_rawOrderId'] = $xml_arr['out_trade_no']; + $save_column['OPN_invoiceId'] = $xml_arr['out_trade_no']; + $save_column['OPN_subject'] = $xml_arr['attach']; + $save_column['OPN_currency'] = $xml_arr['fee_type']; + $save_column['OPN_orderAmount'] = $xml_arr['total_fee']; + $save_column['OPN_payAmount'] = $xml_arr['total_fee']; + $save_column['OPn_transactionResult'] = 'completed'; + $save_column['OPN_resultCode'] = $xml_arr['result_code']; + $save_column['OPN_resultMsg'] = isset($xml_arr['return_msg']) ? $xml_arr['return_msg'] : $xml_arr['result_code']; + $save_column['OPN_errCode'] = isset($xml_arr['err_code']) ? $xml_arr['err_code'] : NULL; + $save_column['OPN_errMsg'] = isset($xml_arr['err_code_des']) ? $xml_arr['err_code_des'] : NULL; + $save_column['OPN_acquiringTime'] = date('Y-m-d H:i:s',strtotime($xml_arr['time_end'])); + $save_column['OPN_completeTime'] = date('Y-m-d H:i:s',strtotime($xml_arr['time_end'])); + $save_column['OPN_remark'] = $xml_arr['attach']; + $save_column['OPN_payerLogId'] = $xml_arr['openid']; + $save_column['OPN_payerStatus'] = $xml_arr['is_subscribe']==='Y' ? "subscribed" : NULL; + $save_column['OPN_fundSource'] = $xml_arr['bank_type']; + $save_column['OPN_entryAmountCNY'] = floatval($ssje); + $save_column['OPN_rawContent'] = json_encode($xml_arr); + $save_column['OPN_noticeTime'] = date('Y-m-d H:i:s'); + // $save_column['OPN_noticeType'] = intval($xml_arr['total_fee'])>0 ? 'pay' : 'refund'; + $save_column['OPN_noticeType'] = 'pay'; + $save_column['OPN_noticeSendStatus'] = 'unsend'; + $save_column['OPN_noticeSendTime'] = NULL; + $save_column['OPN_accountMethod'] = $this->config->item('method_code', 'wxpay'); + if ( $this->note_model->insert_note($save_column) ) { + $response['return_code'] = 'SUCCESS'; + $response['return_msg'] = 'OK'; + } + } + return $this->response_to_wx($response); + } + + public function response_to_wx($response_arr) + { + $response_body = to_xml($response_arr); +// log_message('error',var_export($response_body, 1)); + echo $response_body; + # exit(); // end + } + + public function check_sign($xml_arr) + { + if ( ! array_key_exists('sign', $xml_arr)) { + log_message('error','Wxpay notify error: no sign.'); + return false; + } + if ($this->make_sign($xml_arr) !== $xml_arr['sign']) { + log_message('error','Wxpay notify error: sign.' . $this->make_sign($xml_arr)); + return false; + } + if ($this->wx_site_config['app_id'] !== $xml_arr['appid']) { + log_message('error','Wxpay notify error: appid.'); + return false; + } + if ($this->wx_site_config['mch_id'] !== $xml_arr['mch_id']) { + log_message('error','Wxpay notify error: mch_id.'); + return false; + } + return true; + } + + public function make_sign($xml_arr, $needSignType = false) + { + //签名步骤一：按字典序排序参数 + ksort($xml_arr); + $string = $this->to_url_params($xml_arr); + //签名步骤二：在string后加入KEY + $string = $string . "&key=" . $this->wx_site_config['key']; + //签名步骤三：MD5加密或者HMAC-SHA256 + if(strlen($xml_arr['sign']) <= 32){ + //如果签名小于等于32个,则使用md5验证 + $string = md5($string); + } else { + //是用sha256校验 + $string = hash_hmac("sha256", $string , $this->wx_site_config['key']); + } + //签名步骤四：所有字符转为大写 + $result = strtoupper($string); +// log_message('error',$result); + return $result; + } + + /** + * 格式化参数格式化成url参数 + */ + public function to_url_params($xml_arr) + { + $buff = ""; + foreach ($xml_arr as $k => $v) + { + if($k != "sign" && $v != "" && !is_array($v)){ + $buff .= $k . "=" . $v . "&"; + } + } + + $buff = trim($buff, "&"); + return $buff; + } + +} + diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index 14ce9fcf..c953e061 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -60,8 +60,9 @@ class IPayLinksService extends CI_Controller $this->note_list(); } - public function note_list() + public function note_list2() { + $this->permission->is_admin(true); $data = array(); $data["paytext"] = $this->payment_status(); $data["keywords"] = $this->input->get_post("keywords"); @@ -76,8 +77,26 @@ class IPayLinksService extends CI_Controller return; } + public function note_list() + { + $this->permission->is_admin(true); + $data = array(); + $data["paytext"] = $this->payment_status(); + $data["keywords"] = $this->input->get_post("keywords"); + $data["date"] = $this->input->get_post("date"); + empty($data['date']) ? $data['date'] = date('Y-m-d') : false; + if (!empty($data['keywords'])) { + $data['notelist'] = $this->Note_model->search_key2($data['keywords']); + } else { + $data['notelist'] = $this->Note_model->search_date2($data['date']); + } + $this->load->view("iPayLinks_list2",$data); + return; + } + //失败记录列表 public function note_faillist() { + $this->permission->is_admin(true); $data = array(); $data["paytext"] = $this->payment_status(); //有关键词则不限制日期 @@ -257,18 +276,50 @@ class IPayLinksService extends CI_Controller return; } - public function query_pay($orderid,$day_offset = 3) + public function query_pay($orderid=NULL) { $this->query_info_arr["queryOrderId"] = $this->create_guid(); $this->query_info_arr["orderId"] = $orderid; + $this->query_info_arr["mode"] = 1; + // $this->query_info_arr["type"] = $day_offset; // 1-支付;2-退款 + + $this->query_info_arr["signMsg"] = $this->generate_sign($this->query_info_arr); + $resp = $this->curl($this->queryUrl,$this->query_info_arr); + $resp_obj = simplexml_load_string($resp); + $this->output->set_content_type('application/json')->set_output(json_encode(simplexml_load_string($resp))); + return; + } + public function query_refund($refund_order_id) + { + $this->query_info_arr["queryOrderId"] = $this->create_guid(); + $this->query_info_arr["orderId"] = $refund_order_id; + $this->query_info_arr['mode'] = '1'; + $this->query_info_arr['type'] = '2'; + $this->query_info_arr["signMsg"] = $this->generate_sign($this->query_info_arr); + $resp = $this->curl($this->queryUrl,$this->query_info_arr); + $resp_obj = simplexml_load_string($resp); + $this->output->set_content_type('application/json')->set_output(json_encode(simplexml_load_string($resp))); + return; + } + + public function query_pay_list($day_offset = 3) + { + $this->query_info_arr["queryOrderId"] = $this->create_guid(); $this->query_info_arr["beginTime"] = date('YmdHis',strtotime("-$day_offset days")); - $this->query_info_arr["endTime"] = date('YmdHis',strtotime("+$day_offset days")); - $this->query_info_arr["mode"] = 1; + $this->query_info_arr["endTime"] = date('YmdHis235959'); + $this->query_info_arr["mode"] = 2; + $this->query_info_arr["type"] = 1; // 1-支付;2-退款 $this->query_info_arr["signMsg"] = $this->generate_sign($this->query_info_arr); $resp = $this->curl($this->queryUrl,$this->query_info_arr); - // echo $resp; - var_export($resp); + $resp_obj = simplexml_load_string($resp); + // foreach ($resp_obj->details->detail as $key => $query_order) { + // $order = new stdClass(); + // $order->check = true; + // $order->data = $query_order; + // $this->ipaylinks_notice($order); + // } + $this->output->set_content_type('application/json')->set_output(json_encode(simplexml_load_string($resp))); return; } @@ -313,7 +364,7 @@ class IPayLinksService extends CI_Controller * @date 2017-08-29 * @param string $orderid 订单号 */ - public function batch_send_note($pn_txn_id = false) + public function batch_send_note($pn_txn_id = false, $old_ssje=NULL) { $data = array(); $int = 0; @@ -335,19 +386,19 @@ class IPayLinksService extends CI_Controller foreach ($data['unsend_list'] as $item) { //已经发送的不处理，防止重复发送 - if ($item->IPL_sent == 'send') { + if ($item->IPL_sent == 'send' && empty($pn_txn_id)) { continue; } //退款状态默认为已经处理，陆燕在退款前手动通知外联了，系统跳过处理 if ($item->IPL_payType == 'refund') { - $this->Note_model->update_send($item->IPL_dealId, 'send'); + // $this->Note_model->update_send($item->IPL_dealId, 'send'); continue; } //只处理完成状态，其他状态由陆燕处理 - if (strcmp(trim($item->IPL_resultCode), "0000")) { - $this->Note_model->update_send($item->IPL_dealId, 'send'); + if (strcmp(trim($item->IPL_resultCode), "0000") !== 0 ) { + $this->Note_model->update_send($item->IPL_dealId, 'sendfail'); continue; } @@ -380,16 +431,16 @@ class IPayLinksService extends CI_Controller $this->Note_model->set_invoice($item->IPL_dealId, $orderid_info->orderid . '_' . $orderid_info->ordertype); //检测是否是APP订单,默认不处理 - if ($orderid_info->ordertype == 'A') { //APP自动出票的订单不需要处理 - $this->Note_model->update_send($item->IPL_dealId, 'send'); - continue; - } - + // if ($orderid_info->ordertype == 'A') { //APP自动出票的订单不需要处理 + // $this->Note_model->update_send($item->IPL_dealId, 'send'); + // continue; + // } //添加支付信息入库 //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据 if (!empty($orderid_info)) { $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->IPL_currencyCode))); $ssje = $this->IPayLinks_model->get_ssje($item->IPL_orderAmount, $currencyCode); + $ssje = $old_ssje===NULL ? $ssje : $old_ssje; //更新还没有填的客邮和交易号de收款记录（商务订单） if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { $ht_memo = '交易号(自动录入):' . $item->IPL_dealId; @@ -397,11 +448,31 @@ class IPayLinksService extends CI_Controller //CHTAPP订单添加记录前判断是否有记录，以前的APP版本没有交易号，只能拿金额来判断 if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') { //只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单 - // $this->IPayLinks_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->IPL_dealId, $ht_memo); - // if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { //只修改APP组的订单状态，并且订单进度是我的订单 - // $this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款 - // } + $this->IPayLinks_model->add_account_info_forAPP( + $GAI_COLI_SN, + $advisor_info->COLI_ID, + $item->IPL_orderAmount, + $item->IPL_completeTime, + mb_strtoupper($item->currencyCode), + $ssje, + $item->IPL_completeTime, + $item->IPL_completeTime, + $item->IPL_acquiringTime, + $item->IPL_payerName, + $item->IPL_payerEmail, + $item->IPL_dealId, + $ht_memo); + if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { + //只修改APP组的订单状态，并且订单进度是我的订单 + $this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款 + $this->IPayLinks_model->insert_biz_order_log($GAI_COLI_SN, 'BS8'); + } } else { + // 把订单状态设置为13-新订单已支付 + if (false == $this->IPayLinks_model->if_biz_gai_exists($item->IPL_dealId) ) { + $this->IPayLinks_model->update_biz_coli_state($GAI_COLI_SN, 13); + $this->IPayLinks_model->insert_biz_order_log($GAI_COLI_SN, 'BS13'); + } $this->IPayLinks_model->add_account_info( $GAI_COLI_SN, $advisor_info->COLI_ID, @@ -418,14 +489,16 @@ class IPayLinksService extends CI_Controller $ht_memo ); // 更新订单主表付款方式,防止没访问thankyou-train.asp - $this->IPayLinks_model->update_paymanner($GAI_COLI_SN); + if (empty($advisor_info->COLI_PayManner)) { + $this->IPayLinks_model->update_paymanner($GAI_COLI_SN); + } } } //更新还没有填的客邮和交易号de收款记录（传统订单） elseif (isset($advisor_info->order_type) && $advisor_info->order_type == 1) { $ht_memo = '交易号(自动录入):' . $item->IPL_dealId; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; - $this->IPayLinks_model->add_tour_account_info( + $gai_sn = $this->IPayLinks_model->add_tour_account_info( $GAI_COLI_SN, $item->IPL_orderAmount, $item->IPL_acquiringTime, @@ -441,6 +514,8 @@ class IPayLinksService extends CI_Controller ); //添加汉特的订单提醒 $this->IPayLinks_model->update_coli_introduction($GAI_COLI_SN, '已支付 ' . mb_strtoupper($item->IPL_currencyCode) . $item->IPL_orderAmount); + // 添加HT任务 + $this->IPayLinks_model->exec_addToTask($gai_sn); } } @@ -466,24 +541,25 @@ class IPayLinksService extends CI_Controller $M_State = 0; $this->IPayLinks_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'iPayLinks note'); // 2.给客人发邮件,通知账单 - $toName2 = !empty($item->IPL_payerName) ? $item->IPL_payerName : ''; - $toEmail2 = !empty($item->IPL_payerEmail) ? $item->IPL_payerEmail : ''; - // Zac170919039_T（订单号） / 996.00USD / iPayLinks - $subject2 = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->IPL_orderAmount . $item->IPL_currencyCode . ' / China Highlights'; - // lang - $remark_info = json_decode($item->IPL_memo); - $remark_info = json_decode($remark_info->remark); - $ln = $remark_info->ln; - $ln = $ln ? $ln : "en"; - $this->lang->load('ipl_common',$ln); - $this->lang->load('ipl_buyer_email',$ln); - $item->text = $this->lang->language; - // # lang end - $body2 = $this->load->view('receipt_buyer', $item, true); - $M_RelatedInfo2 = $item->IPL_sn; - $M_AddTime2 = $item->IPL_completeTime; - $M_State2 = 0; - $this->IPayLinks_model->save_automail($fromName, $fromEmail, $toName2, $toEmail2, $subject2, $body2, $M_RelatedInfo2, $M_State2, $M_AddTime2, 'China Highlights Has Received Your Payment'); + if (empty($pn_txn_id)) { + $toName2 = !empty($item->IPL_payerName) ? $item->IPL_payerName : ''; + $toEmail2 = !empty($item->IPL_payerEmail) ? $item->IPL_payerEmail : ''; + // Zac170919039_T（订单号） / 996.00USD / iPayLinks + $subject2 = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->IPL_orderAmount . $item->IPL_currencyCode . ' / China Highlights'; + // lang + $remark_info = json_decode($item->IPL_memo); + (isset($remark_info->remark)) ? $remark_info = json_decode($remark_info->remark) : NULL; + $ln = (isset($remark_info->ln)) ? $remark_info->ln : "en"; + $this->lang->load('ipl_common',$ln); + $this->lang->load('ipl_buyer_email',$ln); + $item->text = $this->lang->language; + // # lang end + $body2 = $this->load->view('receipt_buyer', $item, true); + $M_RelatedInfo2 = $item->IPL_sn; + $M_AddTime2 = $item->IPL_completeTime; + $M_State2 = 0; + $this->IPayLinks_model->save_automail($fromName, $fromEmail, $toName2, $toEmail2, $subject2, $body2, $M_RelatedInfo2, $M_State2, $M_AddTime2, 'China Highlights Has Received Your Payment'); + } // ---- 添加邮件发送记录 end $this->Note_model->update_send($item->IPL_dealId, 'send'); @@ -491,7 +567,8 @@ class IPayLinksService extends CI_Controller } // 批量结果 if (empty($pn_txn_id)) { - echo "done. recorde count:".$int; + echo "count:" . count($data['unsend_list']); + echo "\r\ndone. recorde count:".$int; } return; } @@ -593,41 +670,54 @@ class IPayLinksService extends CI_Controller public function ipaylinks_notice($resp=NULL) { if ($resp !== NULL) { - $resp_arr = $resp; + $asyns_resp = $resp_arr = $resp; } else { $resp_arr = $this->input->post(); log_message('error','iPayLinks asyn notify: ' . $this->input->post("orderId")); + $asyns_resp = $this->verify_sign($resp_arr); } - $asyns_resp = $this->verify_sign($resp_arr); + log_message('error','iPayLinks asyn notify body: ' . json_encode($asyns_resp->data)); // 未得到结果 - if (empty($asyns_resp->data->orderId)) { - echo "200"; - return; - } + // if (empty($asyns_resp->data->orderId)) { + // return; + // } // dealId $dealId = trim($asyns_resp->data->dealId) ; $tmp_deal = $dealId ? $dealId : $this->create_guid(); // payer info - $payer_info = json_decode($asyns_resp->data->remark); - $payer_name = $payer_info->n; - $payer_email = $payer_info->e; + if (isset($asyns_resp->data->remark)) { + $payer_info = json_decode($asyns_resp->data->remark); + $payer_name = $payer_info->n; + $payer_email = $payer_info->e; + } - if (true === $this->if_note_exists($dealId)) { - echo "200"; + bcscale(2); + /** 退款成功 */ + if (isset($asyns_resp->data->refundOrderId) && strcmp($asyns_resp->data->resultCode, '2') == 0) { + $this->Note_model->save_refund( + strval($asyns_resp->data->dealId) + , strval($asyns_resp->data->orderId) + , strval("-" . bcdiv(floatval($asyns_resp->data->refundAmount), 100)) + , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->refundTime))) + , strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->completeTime))) + , $asyns_resp->data->resultCode + , null + , json_encode($asyns_resp->data) + , "refund" + ); return; } - bcscale(2); // 支付成功 // 查询支付结果;入库处理 - if ( ! empty($dealId)) { + // if ( ! empty($dealId)) { $this->Note_model->save_ipl( strval($tmp_deal) ,strval($asyns_resp->data->orderId) ,strval($asyns_resp->data->currencyCode) ,strval(bcdiv(floatval($asyns_resp->data->orderAmount), 100)) ,NULL - ,NULL + ,isset($asyns_resp->data->stateCode) ? $asyns_resp->data->stateCode : NULL ,strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->acquiringTime))) ,strval(date('Y-m-d H:i:s',strtotime($asyns_resp->data->completeTime))) ,json_encode($asyns_resp->data) @@ -637,10 +727,11 @@ class IPayLinksService extends CI_Controller ,strval($payer_name) ,strval($payer_email) ); - $query = $this->query_pay_result($asyns_resp->data); - } + if (strval($asyns_resp->data->resultCode) === "0000") { + $query = $this->query_pay_result($asyns_resp->data); + } + // } // 返回状态码200 - echo "200"; return; } @@ -862,12 +953,97 @@ class IPayLinksService extends CI_Controller ); } + public function gai_modal($pn_txn_id=null, $pn_invoice=null, $pn_id = null, $neworder=null) + { + $this->permission->is_admin(true); + $data = array(); + $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id); + $orderid_info = $this->analysis_orderid($pn_invoice); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->IPayLinks_model->get_money_t($pn_txn_id); + } elseif ($orderid_info->ordertype === 'B') { + $data['gai_info'] = $this->IPayLinks_model->get_money_b($pn_txn_id); + } + } + $data['old_order'] = $pn_invoice; + $data['new_order'] = $neworder; + $data['order_info'] = null; + if ($neworder !== null) { + $neworder_id = $this->analysis_orderid($neworder); + $neworder_id = json_decode($neworder_id); + if ( ! empty($neworder_id)) { + $data['order_info'] = $this->IPayLinks_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype); + } + } + echo json_encode($this->load->view('gai_setting', $data, true)); + } + + public function gai_modal_save() + { + $data = array(); + $old_ssje = NULL; + $pn_txn_id = $this->input->post('pn_txn_id'); + $pn_id = $this->input->post('pn_id'); + $neworder = $this->input->post('pn_invoice'); + + $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id); + $orderid_info = $this->analysis_orderid($data['note']->IPL_orderId); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->IPayLinks_model->get_money_t($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->IPayLinks_model->delete_money_t($pn_txn_id); + } + } elseif ($orderid_info->ordertype === 'B') { + $data['gai_info'] = $this->IPayLinks_model->get_money_b($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->IPayLinks_model->delete_money_b($pn_txn_id); + } + } + } + + if (!empty($pn_txn_id) && !empty($neworder)) { + $orderid_info = $this->analysis_orderid($neworder); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + $advisor_info = $this->IPayLinks_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); + if (!empty($advisor_info)) { + $this->Note_model->set_invoice($pn_txn_id, $neworder); + $this->batch_send_note($pn_txn_id, $old_ssje); + echo json_encode('修改成功！'); + return true; + } + } + } + echo json_encode('没找到数据！'); + return; + } + + public function closeGai($pn_txn_id) + { + $data = array(); + $data['note'] = $this->Note_model->note($pn_txn_id); + if (!empty($data['note'])) { + $this->Note_model->update_send($pn_txn_id, 'closeRecord'); + echo json_encode('该收款记录已经忽略！'); + return true; + } + echo json_encode('没找到数据！'); + return; + } + //获取note详情，以便后续修改各项数据 - public function note_modal($pn_txn_id = false, $pn_invoice = false ,$notice_time = false) { + public function note_modal($pn_txn_id = false, $pn_invoice = false, $pn_id = null) { + $this->permission->is_admin(true); $data = array(); $data['IPL_orderId'] = $pn_invoice; if (!empty($pn_txn_id)) { - $data['note'] = $this->Note_model->note($pn_txn_id); + $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id); if (!empty($data['note'])) { if (!empty($pn_invoice)) { $orderid_info = $this->analysis_orderid($pn_invoice); @@ -925,25 +1101,26 @@ class IPayLinksService extends CI_Controller //修改订单名 public function note_modal_save() { - $data = array(); - - $pn_txn_id = $this->input->post('pn_txn_id'); - $pn_invoice = $this->input->post('pn_invoice'); - - if (!empty($pn_txn_id) && !empty($pn_invoice)) { - $orderid_info = $this->analysis_orderid($pn_invoice); - if (!empty($orderid_info)) { - $orderid_info = json_decode($orderid_info); - $advisor_info = $this->IPayLinks_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); - if (!empty($advisor_info)) { - $this->Note_model->set_invoice($pn_txn_id, $pn_invoice); - $this->batch_send_note($pn_txn_id); - echo json_encode('修改成功！'); - return true; - } - } - } - echo json_encode('没找到数据！'); + $this->gai_modal_save(); + // $data = array(); + + // $pn_txn_id = $this->input->post('pn_txn_id'); + // $pn_invoice = $this->input->post('pn_invoice'); + + // if (!empty($pn_txn_id) && !empty($pn_invoice)) { + // $orderid_info = $this->analysis_orderid($pn_invoice); + // if (!empty($orderid_info)) { + // $orderid_info = json_decode($orderid_info); + // $advisor_info = $this->IPayLinks_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); + // if (!empty($advisor_info)) { + // $this->Note_model->set_invoice($pn_txn_id, $pn_invoice); + // $this->batch_send_note($pn_txn_id); + // echo json_encode('修改成功！'); + // return true; + // } + // } + // } + // echo json_encode('没找到数据！'); return; } @@ -975,6 +1152,7 @@ class IPayLinksService extends CI_Controller */ public function get_refund_list($daylength=3) { + return false; // ipaylinks的批量查询接口已关闭 bcscale(2); $ret = array(); $list = $this->refund_list_info($daylength); @@ -987,7 +1165,7 @@ class IPayLinksService extends CI_Controller , strval(date('Y-m-d H:i:s',strtotime($refund->refundTime))) , strval(date('Y-m-d H:i:s',strtotime($refund->completeTime))) , $refund->stateCode - , "0000" + , ($refund->stateCode==2) ? "0000" : null , json_encode($refund) , "refund" ); @@ -1225,6 +1403,7 @@ class IPayLinksService extends CI_Controller $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(20); $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(30); $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); // 对齐 $objPHPExcel->getActiveSheet()->getStyle('B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); $objPHPExcel->getActiveSheet()->getStyle('C')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); @@ -1234,8 +1413,9 @@ class IPayLinksService extends CI_Controller ->SetCellValue('B1', '团号') ->SetCellValue('C1', '金额') ->SetCellValue('D1', '付款人') - ->SetCellValue('E1', '交易号') - ->SetCellValue('F1', '收单时间'); + ->SetCellValue('E1', '付款人邮箱') + ->SetCellValue('F1', '交易号') + ->SetCellValue('G1', '收单时间'); $currency_sum = array(); bcscale(2); $rowCount = 2; @@ -1248,9 +1428,10 @@ class IPayLinksService extends CI_Controller ->SetCellValue('A'.$rowCount, ($rowCount-1)) ->setCellValueExplicit('B'.$rowCount, $row->IPL_orderId,PHPExcel_Cell_DataType::TYPE_STRING) ->setCellValueExplicit('C'.$rowCount, trim($row->IPL_currencyCode) . number_format($row->IPL_orderAmount, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('D'.$rowCount, $payer) - ->setCellValueExplicit('E'.$rowCount, $row->IPL_dealId,PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('F'.$rowCount, $row->IPL_acquiringTime); + ->SetCellValue('D'.$rowCount, $row->IPL_payerName) + ->SetCellValue('E'.$rowCount, $row->IPL_payerEmail) + ->setCellValueExplicit('F'.$rowCount, $row->IPL_dealId,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('G'.$rowCount, $row->IPL_acquiringTime); $payer = ""; $rowCount++; } @@ -1272,4 +1453,17 @@ class IPayLinksService extends CI_Controller $objWriter->save('php://output'); } + public function sign_fun() + { + $req = $this->input->post(); + $str = $this->generate_sign($req); + return $this->output->set_content_type('application/json')->set_output(json_encode(array("str" => $str))); + } + + public function test() + { + $this->Note_model->test(); + return ; + } + } diff --git a/webht/third_party/pay/helpers/payment_helper.php b/webht/third_party/pay/helpers/payment_helper.php index 3ec1e8cc..80dc5010 100644 --- a/webht/third_party/pay/helpers/payment_helper.php +++ b/webht/third_party/pay/helpers/payment_helper.php @@ -130,12 +130,18 @@ function analysis_orderid($note_invoice_string) { $ordertype = 'N'; if (isset($note_invoice_string[1])) { $ordertype_temp = trim($note_invoice_string[1]); - if (substr($ordertype_temp, 0, 1) == 'T') { + if (substr($ordertype_temp, 0, 2) == 'TP') { + $ordertype = 'TP'; + } elseif (substr($ordertype_temp, 0, 1) == 'T') { $ordertype = 'T'; } elseif (substr($ordertype_temp, 0, 1) == 'B') { $ordertype = 'B'; } } + // 2018.05.28 for Trippest, tourMaster的订单号是01开头 + if (substr($note_invoice_string[0], 0, 2) == '01') { + $ordertype = 'TP'; + } //手机订单、机票订单都没有加标示，在这里帮加上，暂时的，今后还是要在网前设置好 if ($ordertype == 'N' && isset($note_invoice_string[0])) { @@ -180,3 +186,43 @@ function analysis_orderid($note_invoice_string) { } return json_encode(array('orderid' => $pm_orderid, 'ordertype' => $ordertype)); } +/** + * 输出xml字符 + * @throws WxPayException +**/ +function to_xml($arr) +{ + if(!is_array($arr) || count($arr) <= 0) + { + return false; + } + + $xml = ""; + foreach ($arr as $key=>$val) + { + if (is_numeric($val)){ + $xml.="<".$key.">".$val.""; + }else{ + $xml.="<".$key.">"; + } + } + $xml.=""; + return $xml; +} + +/** + * 将xml转为array + * @param string $xml + * @throws WxPayException + */ +function from_xml($xml) +{ + if(!$xml){ + return false; + } + //将XML转为array + //禁止引用外部xml实体 + libxml_disable_entity_loader(true); + return json_decode(json_encode(simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA)), true); +} + diff --git a/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php b/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php index ed892a77..16dd1734 100644 --- a/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php +++ b/webht/third_party/pay/models/AlipayTradeQueryContentBuilder.php @@ -50,6 +50,21 @@ class AlipayTradeQueryContentBuilder extends CI_Model $this->outTradeNo = $outTradeNo; $this->bizContentarr['out_trade_no'] = $outTradeNo; } + + /** + * 查询退款 + */ + private $out_request_no; + public function getOutRequestNo() + { + return $this->out_request_no; + } + public function setOutRequestNo($outRequestNo) + { + $this->out_request_no = $outRequestNo; + $this->bizContentarr['out_request_no'] = $outRequestNo; + } + } ?> diff --git a/webht/third_party/pay/models/Alipay_model.php b/webht/third_party/pay/models/Alipay_model.php index 70510309..e8de4b02 100644 --- a/webht/third_party/pay/models/Alipay_model.php +++ b/webht/third_party/pay/models/Alipay_model.php @@ -18,7 +18,7 @@ class Alipay_model extends CI_Model { $fieldsql = $orderinfo == false ? '' : " ,* "; //先查商务订单B,APP订单A、再查传统订单T if ($ordertype == 'B' || $ordertype == 'A') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_ID =?"; $query = $this->HT->query($sql, array($COLI_ID)); @@ -26,7 +26,7 @@ class Alipay_model extends CI_Model { } //后查传统订单的原因是因为传统订单的订单号去掉外联名字首字母后可能会和商务订单的重合。 if (empty($result) && ($ordertype == 'T')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_ID like '%$COLI_ID'"; $query = $this->HT->query($sql); @@ -36,7 +36,7 @@ class Alipay_model extends CI_Model { //查传统订单add_code，网前实时支付会先生成一个临时订单号存在add_code里，如订单45103248 if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_AddCode =? "; $query = $this->HT->query($sql, array($COLI_ID)); @@ -44,7 +44,7 @@ class Alipay_model extends CI_Model { } if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where EXISTS ( @@ -60,7 +60,7 @@ class Alipay_model extends CI_Model { //订单号查询不到尝试使用团号查询 if (empty($result) && $ordertype == 'B') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_GroupCode like '%-$COLI_ID%'"; $query = $this->HT->query($sql); @@ -68,10 +68,14 @@ class Alipay_model extends CI_Model { } //团号查询不到尝试使用客人邮箱查询(预订多次的老客户得按日期新旧排序，取最新的数据) - if (!empty($result)) { + if (!empty($result) && is_array($result) ) { //print_r($result[0]); //die(); - $result = $result[0]; + if (count($result) > 1) { + $result = array(); + } else { + $result = $result[0]; + } } return $result; @@ -117,14 +121,33 @@ class Alipay_model extends CI_Model { //修改订单状态 public function update_biz_coli_state($coli_sn, $coli_state) { $sql = " - UPDATE BIZ_ConfirmLineInfo - SET COLI_State = ? - WHERE COLI_SN = ? + IF EXISTS + ( SELECT OPI_DEI_SN + FROM OperatorInfo + INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID + WHERE COLI_SN=? AND OPI_DEI_SN=10 + ) + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? + WHERE COLI_SN=? + ELSE + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? WHERE COLI_SN=? + AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999) "; - $query = $this->HT->query($sql, array($coli_state, $coli_sn)); + $query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn)); return $query; } + public function if_biz_gai_exists($GAI_AccreditNo) + { + $sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') + AND DeleteFlag=0"; + $result = $this->HT->query($sql, array($GAI_AccreditNo)); + return ($result->num_rows() > 0); + } + //添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录 public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { //先判断是否有这条数据 @@ -132,7 +155,7 @@ class Alipay_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupAccountInfo - WHERE GAI_COLI_SN = ? AND GAI_SQJE=? + WHERE GAI_COLI_SN = ? AND GAI_SQJE=? and GAI_Type=15015 ) INSERT INTO BIZ_GroupAccountInfo ( GAI_COLI_SN @@ -157,7 +180,7 @@ class Alipay_model extends CI_Model { } //添加收款记录(商务订单) - public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + public function add_account_info($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { //先判断是否有这条数据 $sql = " @@ -174,6 +197,7 @@ class Alipay_model extends CI_Model { ,GAI_SQDate ,GAI_SQJECurrency ,GAI_Money + ,GAI_SSJE ,GAI_SSDate ,GAI_AccountDate ,GAI_SubmitDate @@ -183,14 +207,14 @@ class Alipay_model extends CI_Model { ,GAI_Memo ,GAI_State ,DeleteFlag - ) VALUES (?,?,15015,?,?,?,?,?,?,?,?,?,?,?,0,0)"; - $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + ) VALUES (?,?,15015,?,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_Money, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); return $query; } //添加收款记录(传统订单) - public function add_tour_account_info($GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + public function add_tour_account_info($GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { //先判断是否有这条数据 $sql = " @@ -205,6 +229,7 @@ class Alipay_model extends CI_Model { ,GAI_SQJE ,GAI_SQDate ,GAI_SQJECurrency + ,GAI_SSJE ,GAI_SSDate ,GAI_AccountDate ,GAI_SubmitDate @@ -214,10 +239,10 @@ class Alipay_model extends CI_Model { ,GAI_Memo ,GAI_State ,DeleteFlag - ) VALUES (?,15015,?,?,?,?,?,?,?,?,?,?,0,0)"; - $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + ) VALUES (?,15015,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('GroupAccountInfo'); - return $query; + return $insertid; } //更新线路提醒 @@ -288,4 +313,58 @@ class Alipay_model extends CI_Model { } return 0; } + + /*! + * 更新订单主表付款方式,防止没访问thankyou-train.asp + * @author LYT + */ + public function update_paymanner($COLI_SN, $paymanner = '15015') + { + $sql = "UPDATE BIZ_ConfirmLineInfo SET COLI_PayManner = ? WHERE COLI_SN=? "; + $query = $this->HT->query($sql, array($paymanner, $COLI_SN)); + return $query; + } + + /** JJH: 添加订单收款记录之后执行 */ + public function exec_addToTask($GAI_SN) + { + $sql = " if not exists ( + select top 1 1 from Sysautotask + where SAT_Type=1 and SAT_SourceSN=$GAI_SN + ) exec SP_AddToSystask 1," . $GAI_SN; + $query = $this->HT->query($sql); + return $query; + } + + /** 写入商务订单操作记录 */ + public function insert_biz_order_log($coli_sn, $log_info) + { + $db_column = array( + "BOL_COLI_SN" => $coli_sn + ,"BOL_OPI_SN" => 0 + ,"BOL_OPType" => $log_info + ,"BOL_OPTime" => date('Y-m-d H:i:s') + ,"BOL_Creator" => 0 + ,"BOL_CreateTime" => date('Y-m-d H:i:s') + ); + return $this->HT->insert("BIZ_OrderOperationLog", $db_column); + } + + /*! + * 调用数据库函数,生成实收金额 + * @author LYT + * @date 2017-11-03 + * @param decimal(18,3) $amount + * @param varchar(6) $currency + */ + public function get_ssje($amount, $currency='RMB', $code='15015') + { + $sql = "SELECT dbo.GetSSJEFromSQJE(?, ?, ?) as ssje"; + $query = $this->HT->query($sql,array($code, $currency, $amount)); + $result = $query->result(); + if ( ! empty($result)) { + return $result[0]->ssje; + } + return 0; + } } diff --git a/webht/third_party/pay/models/Alipay_note_model.php b/webht/third_party/pay/models/Alipay_note_model.php index 15294ba7..cafe422b 100644 --- a/webht/third_party/pay/models/Alipay_note_model.php +++ b/webht/third_party/pay/models/Alipay_note_model.php @@ -118,7 +118,8 @@ class Alipay_note_model extends CI_Model { ,$ALI_payerEmail )); $insertid = $this->INFO->last_id('AlipayLog'); - return $query; + $ret = "SELECT TOP 1 * FROM AlipayLog WHERE ALI_dealId='$ALI_dealId' ORDER BY ALI_sn DESC "; + return $this->INFO->query($ret)->row(); } public function get_list() { diff --git a/webht/third_party/pay/models/IPayLinks_model.php b/webht/third_party/pay/models/IPayLinks_model.php index 214407b0..1ba2db80 100644 --- a/webht/third_party/pay/models/IPayLinks_model.php +++ b/webht/third_party/pay/models/IPayLinks_model.php @@ -18,7 +18,7 @@ class IPayLinks_model extends CI_Model { $fieldsql = $orderinfo == false ? '' : " ,* "; //先查商务订单B,APP订单A、再查传统订单T if ($ordertype == 'B' || $ordertype == 'A') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode, COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_ID =?"; $query = $this->HT->query($sql, array($COLI_ID)); @@ -26,7 +26,7 @@ class IPayLinks_model extends CI_Model { } //后查传统订单的原因是因为传统订单的订单号去掉外联名字首字母后可能会和商务订单的重合。 if (empty($result) && ($ordertype == 'T')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_ID like '%$COLI_ID'"; $query = $this->HT->query($sql); @@ -36,7 +36,7 @@ class IPayLinks_model extends CI_Model { //查传统订单add_code，网前实时支付会先生成一个临时订单号存在add_code里，如订单45103248 if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_AddCode =? "; $query = $this->HT->query($sql, array($COLI_ID)); @@ -44,7 +44,7 @@ class IPayLinks_model extends CI_Model { } if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where EXISTS ( @@ -60,7 +60,7 @@ class IPayLinks_model extends CI_Model { //订单号查询不到尝试使用团号查询 if (empty($result) && $ordertype == 'B') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_GroupCode like '%-$COLI_ID%'"; $query = $this->HT->query($sql); @@ -68,10 +68,14 @@ class IPayLinks_model extends CI_Model { } //团号查询不到尝试使用客人邮箱查询(预订多次的老客户得按日期新旧排序，取最新的数据) - if (!empty($result)) { + if (!empty($result) && is_array($result) ) { //print_r($result[0]); //die(); - $result = $result[0]; + if (count($result) > 1) { + $result = array(); // 找到多条匹配的订单记录时,不处理 + } else { + $result = $result[0]; + } } return $result; @@ -117,22 +121,41 @@ class IPayLinks_model extends CI_Model { //修改订单状态 public function update_biz_coli_state($coli_sn, $coli_state) { $sql = " - UPDATE BIZ_ConfirmLineInfo - SET COLI_State = ? - WHERE COLI_SN = ? + IF EXISTS + ( SELECT OPI_DEI_SN + FROM OperatorInfo + INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID + WHERE COLI_SN=? AND OPI_DEI_SN=10 + ) + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? + WHERE COLI_SN=? + ELSE + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? WHERE COLI_SN=? + AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999) "; - $query = $this->HT->query($sql, array($coli_state, $coli_sn)); + $query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn)); return $query; } + public function if_biz_gai_exists($GAI_AccreditNo) + { + $sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') + AND DeleteFlag=0"; + $result = $this->HT->query($sql, array($GAI_AccreditNo)); + return ($result->num_rows() > 0); + } + //添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录 - public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { //先判断是否有这条数据 $sql = " IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupAccountInfo - WHERE GAI_COLI_SN = ? AND GAI_SQJE=? + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') and DeleteFlag=0 and GAI_Type=15018 ) INSERT INTO BIZ_GroupAccountInfo ( GAI_COLI_SN @@ -141,6 +164,7 @@ class IPayLinks_model extends CI_Model { ,GAI_SQJE ,GAI_SQDate ,GAI_SQJECurrency + ,GAI_SSJE ,GAI_SSDate ,GAI_AccountDate ,GAI_SubmitDate @@ -150,8 +174,8 @@ class IPayLinks_model extends CI_Model { ,GAI_Memo ,GAI_State ,DeleteFlag - ) VALUES (?,?,15010,?,?,?,?,?,?,?,?,?,?,0,0)"; - $query = $this->HT->query($sql, array($GAI_COLI_SN, $GAI_SQJE, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + ) VALUES (?,?,15018,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); return $query; } @@ -164,7 +188,7 @@ class IPayLinks_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupAccountInfo - WHERE GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%' + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') and DeleteFlag=0 ) INSERT INTO BIZ_GroupAccountInfo ( GAI_COLI_SN @@ -197,7 +221,7 @@ class IPayLinks_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM GroupAccountInfo - WHERE GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%' + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') AND DeleteFlag=0 ) INSERT INTO GroupAccountInfo ( GAI_COLI_SN @@ -218,7 +242,7 @@ class IPayLinks_model extends CI_Model { ) VALUES (?,15018,?,?,?,?,?,?,?,?,?,?,?,0,0)"; $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('GroupAccountInfo'); - return $query; + return $insertid; } //更新线路提醒 @@ -309,9 +333,11 @@ class IPayLinks_model extends CI_Model { //根据交易号获取收款记录(传统订单) public function get_money_t($pn_invoice) { - $sql = "SELECT GroupAccountInfo.* + $like = $this->HT->escape_like_str($pn_invoice); + $sql = "SELECT COLI_ID,GroupAccountInfo.* from GroupAccountInfo - where GAI_Type='15018' and GAI_AccreditNo=? + inner join ConfirmLineInfo coli on COLI_SN=GAI_COLI_SN + where GAI_Type='15018' and GroupAccountInfo.DeleteFlag=0 and (GAI_AccreditNo=? or GAI_Memo like '%$like%') "; $query = $this->HT->query($sql, array($pn_invoice)); $result = $query->result(); @@ -319,9 +345,11 @@ class IPayLinks_model extends CI_Model { } //根据交易号获取收款记录(商务订单) public function get_money_b($pn_invoice) { - $sql = "SELECT BIZ_GroupAccountInfo.* + $like = $this->HT->escape_like_str($pn_invoice); + $sql = "SELECT COLI_ID,BIZ_GroupAccountInfo.* from BIZ_GroupAccountInfo - where GAI_Type='15018' and GAI_AccreditNo=? + inner join BIZ_ConfirmLineInfo on COLI_SN=GAI_COLI_SN + where GAI_Type='15018' and BIZ_GroupAccountInfo.DeleteFlag=0 and (GAI_AccreditNo=? or GAI_Memo like '%$like%') "; $query = $this->HT->query($sql, array($pn_invoice)); $result = $query->result(); @@ -340,4 +368,41 @@ class IPayLinks_model extends CI_Model { $query = $this->HT->query($sql, array($entry_sum_RMB, $pn_invoice)); return $query; } + /** 删除收款记录 */ + public function delete_money_t($deadId) + { + $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1 WHERE GAI_Type='15018' and GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + public function delete_money_b($deadId) + { + $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1 WHERE GAI_Type='15018' and GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + /** JJH: 添加订单收款记录之后执行 */ + public function exec_addToTask($GAI_SN) + { + $sql = " if not exists ( + select top 1 1 from Sysautotask + where SAT_Type=1 and SAT_SourceSN=$GAI_SN + ) exec SP_AddToSystask 1," . $GAI_SN; + $query = $this->HT->query($sql); + return $query; + } + + /** 写入商务订单操作记录 */ + public function insert_biz_order_log($coli_sn, $log_info) + { + $db_column = array( + "BOL_COLI_SN" => $coli_sn + ,"BOL_OPI_SN" => 0 + ,"BOL_OPType" => $log_info + ,"BOL_OPTime" => date('Y-m-d H:i:s') + ,"BOL_Creator" => 0 + ,"BOL_CreateTime" => date('Y-m-d H:i:s') + ); + return $this->HT->insert("BIZ_OrderOperationLog", $db_column); + } } diff --git a/webht/third_party/pay/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php new file mode 100644 index 00000000..91fc6fa0 --- /dev/null +++ b/webht/third_party/pay/models/Online_payment_account_model.php @@ -0,0 +1,331 @@ +HT = $this->load->database('HT', TRUE); + } + + /*! + * 调用数据库函数,生成实收金额 + * @author LYT + */ + public function get_ssje($amount, $currency='USD', $code) + { + $sql = "SELECT dbo.GetSSJEFromSQJE(?, ?, ?) as ssje"; + $query = $this->HT->query($sql,array($code, $currency, $amount)); + $result = $query->result(); + if ( ! empty($result)) { + return $result[0]->ssje; + } + return NULL; + } + + //根据订单号获取外联邮箱 + public function get_order($COLI_ID, $orderinfo = false, $ordertype = 'N', $handpick=false) { + $result = ''; + $fieldsql = $orderinfo == false ? '' : " ,* "; + //先查商务订单B,APP订单A、再查传统订单T + if ($ordertype == 'B' || $ordertype == 'A' || $ordertype == 'TP') { + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo + LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN + where COLI_ID =?"; + $query = $this->HT->query($sql, array($COLI_ID)); + $result = $query->result(); + } + //后查传统订单的原因是因为传统订单的订单号去掉外联名字首字母后可能会和商务订单的重合。 + if (empty($result) && ($ordertype == 'T')) { + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo + LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN + where COLI_ID like '%$COLI_ID' + order by CHARINDEX('$COLI_ID', COLI_ID) "; + $query = $this->HT->query($sql); + $result = $query->result(); + if ($handpick === TRUE) { + $result = array($result[0]); + } + } + + //查传统订单add_code，网前实时支付会先生成一个临时订单号存在add_code里，如订单45103248 + + if (empty($result) && ($ordertype == 'M')) { + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo + LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN + where COLI_AddCode =? "; + $query = $this->HT->query($sql, array($COLI_ID)); + $result = $query->result(); + } + + if (empty($result) && ($ordertype == 'M')) { + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli + LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN + where + EXISTS ( + SELECT TOP 1 1 + FROM ConfirmLineInfoTmp clit + WHERE clit.COLI_ID = ? + AND cli.COLI_AddCode = CAST(clit.COLI_SN AS VARCHAR(10)) + ) + "; + $query = $this->HT->query($sql, array($COLI_ID)); + $result = $query->result(); + } + + //订单号查询不到尝试使用团号查询 + if (empty($result) && $ordertype == 'B') { + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo + LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN + where COLI_GroupCode like '%-$COLI_ID%'"; + $query = $this->HT->query($sql); + $result = $query->result(); + } + //团号查询不到尝试使用客人邮箱查询(预订多次的老客户得按日期新旧排序，取最新的数据) + + if (!empty($result) && is_array($result) ) { + //print_r($result[0]); + //die(); + if (count($result) > 1) { + $result = array(); + } else { + $result = $result[0]; + } + } + + return $result; + } + + public function if_biz_gai_exists($GAI_AccreditNo) + { + $sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') + AND DeleteFlag=0"; + $result = $this->HT->query($sql, array($GAI_AccreditNo)); + return ($result->num_rows() > 0); + } + + //修改订单状态 + public function update_biz_coli_state($coli_sn, $coli_state) { + $sql = " + IF EXISTS + ( SELECT OPI_DEI_SN + FROM OperatorInfo + INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID + WHERE COLI_SN=? AND OPI_DEI_SN=10 + ) + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? + WHERE COLI_SN=? + ELSE + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? WHERE COLI_SN=? + AND COLI_State IN (0,1,9,11,12,13,14,40,50,60,101,102,999) + "; + $query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn)); + return $query; + } + + /** 写入商务订单操作记录 */ + public function insert_biz_order_log($coli_sn, $log_info) + { + $db_column = array( + "BOL_COLI_SN" => $coli_sn + ,"BOL_OPI_SN" => 0 + ,"BOL_OPType" => $log_info + ,"BOL_OPTime" => date('Y-m-d H:i:s') + ,"BOL_Creator" => 0 + ,"BOL_CreateTime" => date('Y-m-d H:i:s') + ); + return $this->HT->insert("BIZ_OrderOperationLog", $db_column); + } + + /*! + * 更新订单主表付款方式,防止没访问thankyou-train.asp + * @author LYT + * @date 2017-11-27 + */ + public function update_paymanner($COLI_SN, $paymanner = '15010') + { + $sql = "UPDATE BIZ_ConfirmLineInfo SET COLI_PayManner = ? WHERE COLI_SN=? "; + $query = $this->HT->query($sql, array($paymanner, $COLI_SN)); + return $query; + } + + //根据交易号获取收款记录(传统订单) + public function get_money_t($pn_invoice) { + $sql = "SELECT GroupAccountInfo.* + from GroupAccountInfo + where DeleteFlag=0 and GAI_AccreditNo=? + "; + $query = $this->HT->query($sql, array($pn_invoice)); + $result = $query->result(); + return $result; + } + //根据交易号获取收款记录(商务订单) + public function get_money_b($pn_invoice) { + $sql = "SELECT BIZ_GroupAccountInfo.* + from BIZ_GroupAccountInfo + where DeleteFlag=0 and GAI_AccreditNo=? + "; + $query = $this->HT->query($sql, array($pn_invoice)); + $result = $query->result(); + return $result; + } + /** 删除收款记录 */ + public function delete_money_t($deadId) + { + $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + public function delete_money_b($deadId) + { + $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + + //添加收款记录(商务订单) + public function add_account_info($GAI_COLI_SN, $payment_method, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + //先判断是否有这条数据 + $sql = " + + IF NOT EXISTS( + SELECT TOP 1 1 + FROM BIZ_GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') AND DeleteFlag=0 + ) + INSERT INTO BIZ_GroupAccountInfo ( + GAI_COLI_SN + ,GAI_COLI_ID + ,GAI_Type + ,GAI_SQJE + ,GAI_SQDate + ,GAI_SQJECurrency + ,GAI_SSJE + ,GAI_SSDate + ,GAI_AccountDate + ,GAI_SubmitDate + ,GAI_CusName + ,GAI_CusEmail + ,GAI_AccreditNo + ,GAI_Memo + ,GAI_State + ,DeleteFlag + ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $payment_method, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + $insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); + return $query; + } + + //添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录 + public function add_account_info_forAPP($GAI_COLI_SN, $payment_method, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + //先判断是否有这条数据 + $sql = " + IF NOT EXISTS( + SELECT TOP 1 1 + FROM BIZ_GroupAccountInfo + WHERE GAI_COLI_SN = ? AND GAI_SQJE=? AND DeleteFlag=0 AND GAI_Type=? + ) + INSERT INTO BIZ_GroupAccountInfo ( + GAI_COLI_SN + ,GAI_COLI_ID + ,GAI_Type + ,GAI_SQJE + ,GAI_SQDate + ,GAI_SQJECurrency + ,GAI_SSJE + ,GAI_SSDate + ,GAI_AccountDate + ,GAI_SubmitDate + ,GAI_CusName + ,GAI_CusEmail + ,GAI_AccreditNo + ,GAI_Memo + ,GAI_State + ,DeleteFlag + ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_COLI_SN, $GAI_SQJE, $payment_method, $GAI_COLI_SN, $GAI_COLI_ID, $payment_method, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + $insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); + return $query; + } + + //添加收款记录(传统订单) + public function add_tour_account_info($GAI_COLI_SN, $payment_method, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { + //先判断是否有这条数据 + $sql = " + + IF NOT EXISTS( + SELECT TOP 1 1 + FROM GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') and DeleteFlag=0 + ) + INSERT INTO GroupAccountInfo ( + GAI_COLI_SN + ,GAI_Type + ,GAI_SQJE + ,GAI_SQDate + ,GAI_SQJECurrency + ,GAI_SSJE + ,GAI_SSDate + ,GAI_AccountDate + ,GAI_SubmitDate + ,GAI_CusName + ,GAI_CusEmail + ,GAI_AccreditNo + ,GAI_Memo + ,GAI_State + ,DeleteFlag + ) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $payment_method, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); + $insertid = $this->HT->last_id('GroupAccountInfo'); + return $insertid; + } + + //更新线路提醒 + public function update_coli_introduction($coli_sn, $msg) { + $sql = " + update ConfirmLineInfo + set COLI_Introduction=ISNULL(COLI_Introduction,'')+' '+? + where 1=1 + AND ISNULL(COLI_Introduction,'')='' + AND COLI_SN=? + "; + // isnull(COLI_Sended,0) in (0,1) 之前判断是新订单或者未分配状态才添加提示的，有些团是后面付款的，所以把限制取消掉 + $query = $this->HT->query($sql, array($msg, $coli_sn)); + return $query; + } + + /** JJH: 添加订单收款记录之后执行 */ + public function exec_addToTask($GAI_SN) + { + $sql = " if not exists ( + select top 1 1 from Sysautotask + where SAT_Type=1 and SAT_SourceSN=$GAI_SN + ) exec SP_AddToSystask 1," . $GAI_SN; + $query = $this->HT->query($sql); + return $query; + } + + public function save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo = '', $M_State = 0, $M_AddTime = '', $frominfo = 'paypal msg', $M_Web = 'paypal msg') { + $sql = "INSERT INTO + Email_AutomaticSend ( + M_ReplyToName, + M_ReplyToEmail, + M_ToName, + M_ToEmail, + M_Title, + M_Body, + M_Web, + M_FromName, + M_ServiceSN, + M_State, + M_AddTime + ) VALUES (N?, N?, N?, N?, N?, N?, ?, N?, ?,?,getdate()) "; + $query = $this->HT->query($sql, array($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_Web, $frominfo, $M_RelatedInfo, $M_State)); + return $query; + } + +} + diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php new file mode 100644 index 00000000..c17f0cb4 --- /dev/null +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -0,0 +1,150 @@ +info = $this->load->database('INFO', TRUE); + } + + public function insert_note($column) + { + if ($column === null) { + return false; + } + $this->info->insert('OnlinePaymentNote', $column); + $ret = "SELECT TOP 1 * FROM OnlinePaymentNote WHERE OPN_transactionId=? ORDER BY OPN_SN DESC "; + return $this->info->query($ret, array($column['OPN_transactionId']))->row(); + } + + public function update_note($where, $column) + { + $update_str = $this->info->update_string('OnlinePaymentNote', $column, $where); + $this->info->query($update_str); + return TRUE; + } + + public function update_send($id, $transactionId, $send) + { + $column = array("OPN_noticeSendStatus" => $send, "OPN_noticeSendTime" => date('Y-m-d H:i:s')); + $where = " OPN_transactionId = '$transactionId' AND OPN_SN=" . $id; + return $this->update_note($where, $column); + } + + //设置订单号 + public function set_invoice($id, $pn_invoice) + { + $column = array("OPN_orderId" => $pn_invoice); + $where = " OPN_SN=" . $id; + return $this->update_note($where, $column); + } + + public function unsend_note($num=2) + { + $this->init_query(); + $this->topnum = $num; + $this->send = " AND (OPN_noticeSendStatus='unsend' OR OPN_noticeSendStatus='' OR OPN_noticeSendStatus IS NULL) "; + return $this->query_note(); + } + + public function sendfail_note($num=2) + { + $this->init_query(); + $this->topnum = $num; + $this->send = " AND OPN_noticeSendStatus='sendfail' "; + return $this->query_note(); + } + + + public $topnum = false; + public $orderby = false; + public $send = false; + public $search = false; + public $transactionId = false; + public $payment_status = false; + // public $payment_method = false; + + public function init_query() { + $this->topnum = false; + $this->send = false; + $this->search = false; + $this->payment_status = false; + $this->transactionId = false; + // if ($GLOBALS['__PAYMENT_METHOD_CODE__']) { + // $this->payment_method = ' AND opn.OPN_accountMethod = ' . $GLOBALS['__PAYMENT_METHOD_CODE__'] . ' '; + // } + $this->orderby = ' ORDER BY OPN_SN DESC '; + } + + public function query_note() + { + $top_sql = $this->topnum ? (" TOP " . $this->topnum) : ""; + $sql = "SELECT $top_sql opn.* + FROM [InfoManager].[dbo].[OnlinePaymentNote] opn + WHERE 1=1 "; + // $this->payment_method ? $sql.=$this->payment_method : false; + $this->send ? $sql.=$this->send : false; + $this->search ? $sql.=$this->search : false; + $this->transactionId ? $sql.=$this->transactionId : false; + $this->orderby ? $sql.=$this->orderby : false; + $query = $this->info->query($sql); + return $query->result(); + } + + public function get_note($opn_id) + { + $this->init_query(); + $this->topnum=1; + $this->search = " AND opn.OPN_SN=" . $this->info->escape($opn_id); + return $this->query_note(); + } + + public function search_key($keyword) + { + $this->init_query(); + $this->topnum = 300; + $keyword = trim($keyword); + $search_sql = ""; + if ( ! empty($keyword)) { + $search_sql.=" AND ( OPN_transactionId = '$keyword' + OR OPN_orderId like '%$keyword%' + OR OPN_rawOrderId like '%$keyword%' )"; + } + $this->search = $search_sql; + return $this->query_note(); + } + + public function search_date($date) + { + $this->init_query(); + $this->search = " AND OPN_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' "; + return $this->query_note(); + } + + public function failnote($topnum = 2) { + $this->init_query(); + $this->topnum = $topnum; + $this->send = " AND OPN_noticeSendStatus='sendfail' "; + return $this->query_note(); + } + + /*! + * 导出记录 + * @date 2019-04-28 + * @param integer $sn [description] + */ + public function list_export_record($sn=0) + { + $search_sql = $sn===0 ? "" : " and TEL_SN=$sn "; + $sql = "SELECT TOP 10 * + FROM [InfoManager].[dbo].[Transaction_Export_Log] + WHERE 1=1 + $search_sql + order by TEL_SN desc"; + return $this->info->query($sql)->result(); + } + + +} + diff --git a/webht/third_party/pay/models/note_model.php b/webht/third_party/pay/models/note_model.php index 0f30a40c..ba7942ca 100644 --- a/webht/third_party/pay/models/note_model.php +++ b/webht/third_party/pay/models/note_model.php @@ -5,12 +5,13 @@ if (!defined('BASEPATH')) class Note_model extends CI_Model { - var $topnum = false; - var $orderby = false; - var $send = false; - var $search = false; - var $dealId = false; - var $payment_status = false; + var $topnum = null; + var $orderby = null; + var $send = null; + var $search = null; + var $date = null; + var $dealId = null; + var $payment_status = null; function __construct() { parent::__construct(); @@ -18,12 +19,13 @@ class Note_model extends CI_Model { } public function init() { - $this->topnum = false; - $this->send = false; - $this->search = false; - $this->payment_status = false; - $this->dealId = false; - $this->orderby = ' ORDER BY pn.IPL_sn DESC '; + $this->topnum = null; + $this->send = null; + $this->search = null; + $this->date = null; + $this->payment_status = null; + $this->dealId = null; + $this->orderby = ' ORDER BY IPL_sent DESC ,IPL_sn DESC '; } public function unsend($topnum = 2) { @@ -42,16 +44,25 @@ class Note_model extends CI_Model { public function search_date($date) { $this->init(); - $search_sql = " AND pn.IPL_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' "; + $search_sql = " AND (IPL_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' ) "; $this->search = $search_sql; - $this->orderby=" ORDER BY CASE pn.IPL_sent WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.IPL_sn DESC "; + $this->send = " AND (IPL_sent<>'closeRecord') "; + $this->orderby=" ORDER BY IPL_sent DESC ,IPL_sn DESC "; return $this->get_list(); } + public function search_date2($date) { + $this->init(); + $search_sql = " AND (IPL_noticeTime BETWEEN '$date 00:00:00' AND '$date 23:59:59' ) "; + $this->date = $search_sql; + $this->orderby=" ORDER BY IPL_sent DESC ,IPL_sn DESC "; + return $this->get_list_with_order(); + } - public function note($txn_id){ + public function note($txn_id, $pn_id=null){ $this->init(); $this->topnum=1; - $this->dealId=" AND pn.IPL_dealId=".$this->INFO->escape($txn_id); + $this->dealId=" AND IPL_dealId=".$this->INFO->escape($txn_id); + $this->dealId .= ($pn_id===null) ? " " : " AND IPL_sn=" . $pn_id; return $this->get_list(); } @@ -59,7 +70,7 @@ class Note_model extends CI_Model { { $this->init(); $this->topnum=1; - $this->dealId=" AND pn.IPL_orderId=".$this->INFO->escape($orderid)." AND pn.IPL_noticeTime=".$this->INFO->escape($notice_time); + $this->dealId=" AND IPL_orderId=".$this->INFO->escape($orderid)." AND IPL_noticeTime=".$this->INFO->escape($notice_time); return $this->get_list(); } @@ -69,19 +80,32 @@ class Note_model extends CI_Model { $search_sql = ''; $search_key = trim($search_key); if (!empty($search_key)) { - $search_sql.=" AND ( pn.IPL_dealId = '$search_key' - OR pn.IPL_orderId like '%$search_key%' - OR pn.IPL_memo like '%$search_key%' )"; + $search_sql.=" AND ( IPL_dealId = '$search_key' + OR IPL_orderId like '%$search_key%' + OR IPL_memo like '%$search_key%' )"; } $this->search = $search_sql; return $this->get_list(); } + public function search_key2($search_key) { + $this->init(); + $this->topnum = 300; //限制最大数量，防止查询单词过短 + $search_sql = ''; + $search_key = trim($search_key); + if (!empty($search_key)) { + $search_sql.=" AND ( IPL_dealId = '$search_key' + OR IPL_orderId like '%$search_key%' + OR IPL_memo like '%$search_key%' )"; + } + $this->search = $search_sql; + return $this->get_list_with_order(); + } public function note_exists($dealId) { $this->init(); $this->topnum = 1; - $this->search = " AND pn.IPL_dealId = '".$dealId."' "; + $this->search = " AND IPL_dealId = '".$dealId."' "; return $this->get_list(); } @@ -122,32 +146,81 @@ class Note_model extends CI_Model { } public function get_list() { - $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT "; - $sql .= " - pn.IPL_sn - ,pn.IPL_dealId - ,pn.IPL_orderId - ,pn.IPL_currencyCode - ,pn.IPL_orderAmount - ,pn.IPL_payAmount - ,pn.IPL_stateCode - ,pn.IPL_resultCode - ,pn.IPL_resultMsg - ,pn.IPL_acquiringTime - ,pn.IPL_completeTime - ,pn.IPL_memo - ,pn.IPL_sent - ,pn.IPL_payType - ,pn.IPL_noticeTime - ,pn.IPL_payerName - ,pn.IPL_payerEmail + // $this->topnum ? $sql = "SELECT TOP " . $this->topnum : $sql = "SELECT "; + $this->topnum ? $top_sql = " TOP " . $this->topnum : $top_sql = " "; + $sql = "SELECT $top_sql + pn.* FROM IPayLinksLog pn WHERE 1=1 - "; - $this->send ? $sql.=$this->send : false; - $this->search ? $sql.=$this->search : false; - $this->dealId ? $sql.=$this->dealId : false; - $this->orderby ? $sql.=$this->orderby : false; + and pn.IPL_payType='pay' + and (pn.IPL_resultCode='0000') + $this->send + $this->search + $this->dealId + UNION ALL + select $top_sql * from InfoManager.dbo.IPayLinksLog ipl2 + where 1=1 + and ipl2.IPL_payType='refund' + and ipl2.IPL_stateCode=2 + $this->send + $this->search + $this->dealId + $this->orderby + "; + + $query = $this->INFO->query($sql); + if ($this->topnum === 1) { + if ($query->num_rows() > 0) { + $row = $query->row(); + return $row; + } else { + return FALSE; + } + } else { + return $query->result(); + } + } + + /*! + * 查询异步通知记录 + * isRecord + * * 9999 已录入到订单收款记录表GAI; + * * 99999 APP组的收款记录, 由他们手动处理 + * * 10000 已忽略的退款记录; 关闭检测是否记录[已忽略] + * * 1 未录入到订单GAI + * @date 2018-07-27 + * @return [type] [description] + */ + public function get_list_with_order() + { + $sql = "SELECT + -- gai.GAI_SN, + -- gaib.GAI_SN, + -- COLI.COLI_ID, + case + when IPL_payType='pay' and (ISNULL(gaib.GAI_SN, 0)+ISNULL(gai.GAI_SN, 0))>0 then 9999 + when IPL_payType='pay' and coli.COLI_ID is not null then 99999 + when IPL_payType<>'pay' then 10000 + when IPL_sent='closeRecord' then 10000 + else 1 + end isRecord, + ipl.* + from InfoManager.dbo.IPayLinksLog ipl + left join Tourmanager.dbo.BIZ_ConfirmLineInfo coli on coli.COLI_ID=ipl.IPL_orderId and coli.COLI_Department=16 + left join Tourmanager.dbo.BIZ_GroupAccountInfo gaib on ipl.IPL_dealId=gaib.GAI_AccreditNo and gaib.DeleteFlag=0 and ipl.IPL_payType='pay' + left join Tourmanager.dbo.GroupAccountInfo gai on gai.GAI_AccreditNo=ipl.IPL_dealId and gai.DeleteFlag=0 and ipl.IPL_payType='pay' + where 1=1 + and ( (ipl.IPL_stateCode=2 and ipl.IPL_payType<>'pay') or (ipl.IPL_resultCode='0000' and ipl.IPL_payType='pay') ) + $this->send + $this->search + $this->dealId + and ( + 1=1 + $this->date + -- AND (IPL_noticeTime BETWEEN '2018-07-27 00:00:00' AND '2018-07-27 23:59:59' or IPL_sent<>'send') + or ((ISNULL(gaib.GAI_SN, 0)+ISNULL(gai.GAI_SN, 0))=0 and IPL_payType='pay' AND (IPL_sent<>'closeRecord') and COLI.COLI_ID is null) + ) + order by isRecord asc,ipl.IPL_sent desc,IPL_sn desc"; $query = $this->INFO->query($sql); if ($this->topnum === 1) { if ($query->num_rows() > 0) { @@ -196,7 +269,7 @@ class Note_model extends CI_Model { $sql = "IF NOT EXISTS( SELECT TOP 1 1 FROM IPayLinksLog - WHERE IPL_dealId = ? + WHERE IPL_dealId = ? AND IPL_payType='refund' ) INSERT INTO IPayLinksLog ( @@ -276,8 +349,8 @@ class Note_model extends CI_Model { public function date_range($from, $to, $currency=NULL) { $this->init(); - $search_sql = " AND pn.IPL_resultCode='0000' "; - $search_sql .= " AND pn.IPL_acquiringTime BETWEEN '$from 00:00:00' AND '$to 23:59:59' "; + $search_sql = " AND IPL_resultCode='0000' "; + $search_sql .= " AND IPL_acquiringTime BETWEEN '$from 00:00:00' AND '$to 23:59:59' "; if ( ! empty($currency)) { $search_sql .= " AND IPL_currencyCode = '$currency' "; } @@ -286,4 +359,11 @@ class Note_model extends CI_Model { return $this->get_list(); } + public function test() + { + $sql = " "; + $this->INFO->query($sql); + return; + } + } diff --git a/webht/third_party/pay/views/alipay_list.php b/webht/third_party/pay/views/alipay_list.php index 7bb47876..faceb099 100644 --- a/webht/third_party/pay/views/alipay_list.php +++ b/webht/third_party/pay/views/alipay_list.php @@ -21,6 +21,33 @@ .pay_form .result_info{padding-top: 5px!important;} @@ -48,7 +76,14 @@

    Alipay Notes

    +
    @@ -60,7 +95,7 @@
    - +
    @@ -131,7 +166,8 @@ $show_send = $item->ALI_sent; } else if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS")) { $class_css = 'btn-danger'; - $show_send = $paytext[intval(trim($item->ALI_resultMsg))]; + // $show_send = $paytext[intval(trim($item->ALI_resultMsg))]; + $show_send = strstr($item->ALI_resultMsg, "_"); } else { $class_css = 'btn-danger'; $show_send = $item->ALI_sent; @@ -173,6 +209,9 @@
    + @@ -191,6 +230,7 @@ }); $(".ui-datepicker").css('width', '15.7em'); + }); function show_order_modal(pn_txn_id, pn_invoice,noticeTime,old_order) { if (pn_txn_id) { diff --git a/webht/third_party/pay/views/alipay_note_setting.php b/webht/third_party/pay/views/alipay_note_setting.php index 90332bba..e1bcc4bb 100644 --- a/webht/third_party/pay/views/alipay_note_setting.php +++ b/webht/third_party/pay/views/alipay_note_setting.php @@ -1,4 +1,4 @@ - +
    交易号
    diff --git a/webht/third_party/pay/views/gai_setting.php b/webht/third_party/pay/views/gai_setting.php new file mode 100644 index 00000000..06808d0c --- /dev/null +++ b/webht/third_party/pay/views/gai_setting.php @@ -0,0 +1,42 @@ + + +

    已录入订单

    + + + + + + + $value) { ?> + + + + + + +
    订单号申请金额/币种实收金额
    COLI_ID; ?>GAI_SQJE; ?> GAI_SQJECurrency; ?>GAI_SSJE; ?> CNY
    +

    撤回以上订单收款记录, 并转移到订单: (手动录入的不会撤回)

    + +
    + + +
    + +
    订单详细内容:
    +

    + $order_info->COLI_SN
    "; + echo "COLI_ID => $order_info->COLI_ID
    "; + echo "OPI_Email => $order_info->OPI_Email
    "; + echo "OPI_Name => $order_info->OPI_Name
    "; + echo!empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode
    " : false; + echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false; + } else { + echo '找不到目标订单内容'; + } + ?> +

    + + + diff --git a/webht/third_party/pay/views/iPayLinks_list.php b/webht/third_party/pay/views/iPayLinks_list.php index ce91c9c7..bd101cac 100644 --- a/webht/third_party/pay/views/iPayLinks_list.php +++ b/webht/third_party/pay/views/iPayLinks_list.php @@ -52,7 +52,7 @@
    -
    +
    @@ -75,9 +75,16 @@
    -
    +
    @@ -159,6 +166,8 @@ $class_css = ''; if ($item->IPL_sent == 'send') { $show_send = $item->IPL_sent; + } else if ($item->IPL_sent == 'closeRecord') { + $show_send = "已忽略"; } else if (strcmp(trim($item->IPL_stateCode), "2") && $item->IPL_stateCode != NULL) { $class_css = 'btn-danger'; $show_send = $paytext[intval(trim($item->IPL_stateCode))]; @@ -166,7 +175,7 @@ $class_css = 'btn-danger'; $show_send = $item->IPL_sent; } - ?> + ?> @@ -253,12 +262,12 @@ return date; } }); - function show_order_modal(pn_txn_id, pn_invoice,noticeTime,old_order) { + function show_order_modal(pn_txn_id, pn_invoice,noticeTime,old_order, pn_id) { if (pn_txn_id) { $.ajax({ type: "get", dataType: "json", - url: '/webht.php/apps/pay/ipaylinksservice/note_modal/' + pn_txn_id , + url: '/webht.php/apps/pay/ipaylinksservice/note_modal/' + pn_txn_id + '/' + pn_invoice + '/' + pn_id, success: function(data, textStatus) { $('#modal_set_orderid_body').html(data); $('#modal_set_orderid').modal('show'); diff --git a/webht/third_party/pay/views/iPayLinks_list2.php b/webht/third_party/pay/views/iPayLinks_list2.php new file mode 100644 index 00000000..0a981772 --- /dev/null +++ b/webht/third_party/pay/views/iPayLinks_list2.php @@ -0,0 +1,443 @@ + +* @date 2017-09-06 +*/ +?> + + + + + + iPayLinks Notes - China Highlights + + + + + + + + + + +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    +

    + +
    +

    通知状态:

    +

    1.send 表示通知正确发送给外联

    +

    2.unsend 表示通知在等待处理，5~10分钟系统处理一遍

    +

    3.sendfail 状态的需要手工设置正确的订单号

    +

    4.Pending 还未到账，需要人工检查，确认支付或者取消，需要手工关闭此通知

    +

    5.Denied 银行拒付，需要手工关闭此通知

    +
    +
    + +
    + + $item) { + ?> +
      + +
      • +
    • + IPL_dealId) { ?> + + + + + IPL_orderId . ' / ' . $item->IPL_orderAmount . $item->IPL_currencyCode ; ?> +
      • + +
    • + IPL_payType == 'refund') { + echo "退款"; + } else { + echo $item->IPL_payerName . "
      " . $item->IPL_payerEmail; + } ?> +
      • + +
    • IPL_dealId; ?>
      • + +
    • IPL_acquiringTime; ?>
      • +
    • IPL_noticeTime; ?>
      • +
    • + IPL_sent == 'send') { + $show_send = $item->IPL_sent; + } else if ($item->IPL_sent == 'closeRecord') { + $show_send = "已忽略"; + } else if (strcmp(trim($item->IPL_stateCode), "2") && $item->IPL_stateCode != NULL) { + $class_css = 'btn-danger'; + $show_send = $paytext[intval(trim($item->IPL_stateCode))]; + } else { + $class_css = 'btn-danger'; + $show_send = $item->IPL_sent; + } + ?> + +
      + isRecord == '10000') { + $isRecord = '已忽略'; + } elseif ($item->isRecord == '99999') { + $isRecord = 'APP组处理'; + } elseif ($item->isRecord == '9999') { + $isRecord = '已录入'; + } else { + $isRecord = '未记录'; + $record_class = ' btn btn-sm btn_margin btn-warning '; + } + ?> + + + +
      • +
    + + +
    + +
    +

    © 1998 China Highlights. + Privacy Statement +

    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + diff --git a/webht/third_party/pay/views/mail_advisor.php b/webht/third_party/pay/views/mail_advisor.php new file mode 100644 index 00000000..272340c6 --- /dev/null +++ b/webht/third_party/pay/views/mail_advisor.php @@ -0,0 +1 @@ +
    payment logo
    Transaction ID:  
    Hello Guilin China International Travel Service Co.,Ltd,
    You received a payment of
    Seller Protection-
    Buyer


    Description     Amount

    diff --git a/webht/third_party/pay/views/note_setting.php b/webht/third_party/pay/views/note_setting.php index 47280d28..973aef58 100644 --- a/webht/third_party/pay/views/note_setting.php +++ b/webht/third_party/pay/views/note_setting.php @@ -13,13 +13,12 @@
    IPL_acquiringTime; ?>
    -
    订单号
    - +
    @@ -28,7 +27,6 @@
    订单详细内容
    - $order_info->COLI_SN
    "; @@ -50,4 +48,5 @@
    + diff --git a/webht/third_party/pay/views/payment_gai_setting.php b/webht/third_party/pay/views/payment_gai_setting.php new file mode 100644 index 00000000..097a3f7b --- /dev/null +++ b/webht/third_party/pay/views/payment_gai_setting.php @@ -0,0 +1,59 @@ +
    + +

    已录入订单

    + + + + + + + $value) { ?> + + + + + + +
    订单号申请金额/币种实收金额
    GAI_COLI_ID; ?>GAI_SQJE; ?> GAI_SQJECurrency; ?>GAI_SSJE; ?> CNY
    +

    撤回以上订单收款记录, 并转移到订单: (手动录入的不会撤回)

    + +
    +
    交易号
    +
    OPN_transactionId ?> ( OPN_noticeType) . " " . $note->OPN_transactionResult; ?> )
    +
    +
    +
    付款金额
    +
    OPN_currency . ' ' . $note->OPN_orderAmount ?>
    +
    +
    +
    付款时间
    +
    OPN_completeTime; ?>
    +
    + +
    + + +
    + +
    订单详细内容:
    +

    + $order_info->COLI_SN
    "; + echo "COLI_ID => $order_info->COLI_ID
    "; + echo "OPI_Email => $order_info->OPI_Email
    "; + echo "OPI_Name => $order_info->OPI_Name
    "; + echo!empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode
    " : false; + echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false; + } else { + echo '找不到目标订单内容'; + } + ?> +

    + + +
    +
    +

    原始数据

    +

    +
    diff --git a/webht/third_party/pay/views/payment_list.php b/webht/third_party/pay/views/payment_list.php new file mode 100644 index 00000000..57310825 --- /dev/null +++ b/webht/third_party/pay/views/payment_list.php @@ -0,0 +1,303 @@ + + + + + + + + + + Payment List - China Highlights + + + + + + + + + + + + + +
    +
    +
    + +
    +
    +
    +
    + + +
    +
    +
    +
    +

    + + +
    + +
    + + + + + + + + + + + + + + $item) { + ?> + + + + + + + + + + + +
    #主题付款人交易号收单时间通知时间状态[通知/记录]
    OPN_orderId . ' / ' . $item->OPN_orderAmount . $item->OPN_currency; ?> + OPN_payerEmail; + ?> + OPN_transactionId; ?>OPN_acquiringTime; ?>OPN_noticeTime; ?> + OPN_accountStatus !== 'recorded') { + $send_class = 'btn-danger'; + } + if ($item->OPN_noticeSendStatus !== 'send' ) { + $send_class = 'btn-danger'; + } + if ($item->OPN_noticeSendStatus === 'closed') { + $send_class = ''; + } + ?> + OPN_noticeType !== 'pay') { + echo '' . strtoupper($item->OPN_noticeType) . '
    '; + } ?> + + OPN_noticeSendStatus .' / ' . $item->OPN_accountStatus; ?> + +
    +
    + +
    +
    +
    + + + + + + diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 7d1f3d8b..3c2bdb67 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -10,6 +10,7 @@ class Index extends CI_Controller { // $this->output->enable_profiler(TRUE); $this->load->model('Paypal_model'); $this->load->model('Note_model'); + bcscale(2); } public function index() { @@ -189,6 +190,21 @@ class Index extends CI_Controller { echo ('更新了' . ($result_count) . '条记录'); } + public function get_transactions_detail_by_paymentToken() + { + $token = $this->input->post("t"); + $base = $this->base(0); + // $post = "METHOD=GetTransactionDetails&VERSION=100.0&TRANSACTIONID=$token"; + // $post = "METHOD=GetExpressCheckoutDetails&VERSION=124.0&TOKEN=$token"; + + $token = str_replace(' ', 'T', $token) . 'Z'; + $post = "METHOD=TransactionSearch&VERSION=100.0&TRANSACTIONCLASS=ALL&STARTDATE=$token"; + + $detail = $this->call($base, $post); + var_dump($detail); + return; + } + //根据交易号获取交易详细信息 public function get_transactions_detail($redirect = 0) { //从数据库提取一条还没有更新交易详情的记录获取交易号 @@ -554,8 +570,10 @@ class Index extends CI_Controller { //存储paypal发送的消息 public function paypal_note() { $pn_txn_id = $this->input->post('txn_id'); + log_message('error','paypal-note: ' . $pn_txn_id); $pn_invoice = $this->input->post('invoice'); + empty($pn_invoice) ? $pn_invoice = $this->input->post('transaction_subject') : false; empty($pn_invoice) ? $pn_invoice = '' : false; $pn_custom = $this->input->post('custom'); @@ -585,10 +603,12 @@ class Index extends CI_Controller { //把PDT时间转成GMT时间 $pn_payment_date = gmdate('Y-m-d H:i:s', strtotime($pn_payment_date)); $this->Note_model->save_paypal_note($pn_txn_id, $pn_invoice, $pn_custom, $pn_mc_gross, $pn_item_name, $pn_item_number, $pn_mc_currency, $pn_payment_status, $pn_payer, $pn_payer_email, $pn_payment_date, $pn_memo); - echo 'ok'; + log_message('error','paypal-note-succeed ' . $pn_txn_id . ' # ' . $pn_invoice); + // echo 'ok'; } else { - echo 'no'; + // echo 'no'; } + return ; } //解析出订单号 @@ -627,12 +647,18 @@ class Index extends CI_Controller { $ordertype = 'N'; if (isset($note_invoice_string[1])) { $ordertype_temp = trim($note_invoice_string[1]); - if (substr($ordertype_temp, 0, 1) == 'T') { + if (substr($ordertype_temp, 0, 2) == 'TP') { + $ordertype = 'TP'; + } elseif (substr($ordertype_temp, 0, 1) == 'T') { $ordertype = 'T'; } elseif (substr($ordertype_temp, 0, 1) == 'B') { $ordertype = 'B'; } } + // 2018.05.28 for Trippest, tourMaster的订单号是01开头 + if (substr($note_invoice_string[0], 0, 2) == '01') { + $ordertype = 'TP'; + } //手机订单、机票订单都没有加标示，在这里帮加上，暂时的，今后还是要在网前设置好 if ($ordertype == 'N' && isset($note_invoice_string[0])) { @@ -688,8 +714,9 @@ class Index extends CI_Controller { */ //找到没有发送的记录 - public function send_note($pn_txn_id = false) { + public function send_note($pn_txn_id = false, $old_ssje=NULL) { $data = array(); + $handpick = empty($pn_txn_id) ? false : TRUE; //优先处理指定的交易号，用于修正交易号直接发送通知 if (!empty($pn_txn_id)) { @@ -710,7 +737,7 @@ class Index extends CI_Controller { foreach ($data['unsend_list'] as $item) { //已经发送的不处理，防止重复发送 - if ($item->pn_send == 'send') { + if ($item->pn_send == 'send' && empty($pn_txn_id)) { continue; } @@ -731,7 +758,13 @@ class Index extends CI_Controller { } //检测是否是APP订单,默认不处理 - if ((strpos($item->pn_memo, 'China Train Booking') !== false) || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false)) { //APP自动出票的订单不需要处理 + // && $item->pn_payment_status !== 'Refunded' + if ( + ( (strpos($item->pn_memo, 'China Train Booking') !== false) + || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false) + ) + && empty($pn_txn_id) + ) { //APP自动出票的订单不需要处理 $this->Note_model->update_send($item->pn_txn_id, 'send'); continue; } @@ -757,7 +790,14 @@ class Index extends CI_Controller { //根据订单号查找外联信息 $orderid_info = json_decode($orderid_info); - $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); + $handpick = empty($pn_txn_id) ? false : TRUE; + $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); + + // for trippest tourMaster 2018.05.28 + if ($orderid_info->ordertype == 'TP') { + $this->trippest_note($orderid_info, $item); + continue; + } //查不到订单信息 if (empty($advisor_info)) { @@ -769,7 +809,7 @@ class Index extends CI_Controller { $this->Note_model->set_invoice($item->pn_txn_id, $orderid_info->orderid . '_' . $orderid_info->ordertype); //检测是否是APP订单,默认不处理 - if ($orderid_info->ordertype == 'A') { //APP自动出票的订单不需要处理 + if ($orderid_info->ordertype == 'A' ) { //APP自动出票的订单不需要处理 $this->Note_model->update_send($item->pn_txn_id, 'send'); continue; } @@ -777,19 +817,25 @@ class Index extends CI_Controller { //添加支付信息入库 //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据 if (!empty($orderid_info)) { + $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); + $ssje = $old_ssje===NULL ? $ssje : $old_ssje; //更新还没有填的客邮和交易号de收款记录（商务订单） if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { $ht_memo = '交易号(自动录入):' . $item->pn_txn_id; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; //CHTAPP订单添加记录前判断是否有记录，以前的APP版本没有交易号，只能拿金额来判断 if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') {//只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单 - $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); $this->Paypal_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); if ($advisor_info->COLI_WebCode == 'CHTAPP' && $advisor_info->COLI_State == 11) { //只修改APP组的订单状态，并且订单进度是我的订单 $this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 8); //把订单状态改为已付款 + $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'BS8'); } } else { - $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); + // 把订单状态设置为13-新订单已支付 + if (false == $this->Paypal_model->if_biz_gai_exists($item->pn_txn_id) ) { + $this->Paypal_model->update_biz_coli_state($GAI_COLI_SN, 13); + $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'BS13'); + } $this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); // 更新订单主表付款方式,防止没访问thankyou-train.asp $this->Paypal_model->update_paymanner($GAI_COLI_SN, '15010'); @@ -799,22 +845,25 @@ class Index extends CI_Controller { elseif (isset($advisor_info->order_type) && $advisor_info->order_type == 1) { $ht_memo = '交易号(自动录入):' . $item->pn_txn_id; $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; - $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); - $this->Paypal_model->add_tour_account_info($GAI_COLI_SN, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); + $gai_sn = $this->Paypal_model->add_tour_account_info($GAI_COLI_SN, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payer, $item->pn_payer_email, $item->pn_txn_id, $ht_memo); //添加汉特的订单提醒 $this->Paypal_model->update_coli_introduction($GAI_COLI_SN, '已支付 ' . mb_strtoupper($item->pn_mc_currency) . $item->pn_mc_gross); + // 添加HT任务 + $this->Paypal_model->exec_addToTask($gai_sn); } } $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie + //没有外联信息表示订单未分配 if (empty($opi_email) || empty($opi_firstname)) { $this->Note_model->update_send($item->pn_txn_id, 'sendfail'); continue; } + //添加邮件发送记录 //给外联发送通知邮件 $fromName = !empty($item->pn_payer) ? $item->pn_payer : ''; @@ -825,7 +874,7 @@ class Index extends CI_Controller { $body = $this->load->view('mail_templete', $item, true); //$item->pn_memo; $M_RelatedInfo = $item->pn_sn; $M_AddTime = $item->pn_payment_date; - $M_State = 0; //设置已经发送，测试专用 + $M_State = 0; $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); //添加邮件发送记录 end @@ -834,8 +883,175 @@ class Index extends CI_Controller { //echo 'done!'; } + public function send_refund($item, $handpick, $old_ssje=NULL) + { + // 找到原始收款交易的订单 + $parent_note = $this->note_modal->note($item->parent_txn_id); + if (empty($parent_note)) { + return false; + } + //订单号 + $orderid_info = $this->analysis_orderid($parent_note->pn_invoice); + + //找不到订单号，设置为发送失败标示 + if (empty($orderid_info)) { + $this->Note_model->update_send($item->pn_txn_id, 'sendfail'); + return false; + } + + // for trippest tourMaster 2018.05.28 + if ($orderid_info->ordertype == 'TP') { + $this->trippest_note($orderid_info, $item); + return false; + } + + //根据订单号查找外联信息 + $orderid_info = json_decode($orderid_info); + $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); + + //查不到订单信息 + if (empty($advisor_info)) { + $this->Note_model->update_send($item->pn_txn_id, 'sendfail'); + return false; + } + + //更新正确的订单信息到记录中，以这个为主 + $this->Note_model->set_invoice($item->pn_txn_id, $orderid_info->orderid . '_' . $orderid_info->ordertype); + + //添加支付信息入库 + //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据 + if (!empty($orderid_info)) { + $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); + $ssje = $old_ssje===NULL ? $ssje : $old_ssje; + //更新还没有填的客邮和交易号de收款记录（商务订单） + if (isset($advisor_info->order_type) && $advisor_info->order_type == 0) { + $ht_memo = '退款交易号(自动录入):' . $item->pn_txn_id . "\n. "; + $ht_memo .= '原收款交易号(自动录入):' . $item->parent_txn_id; + $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; + //CHTAPP订单添加记录前判断是否有记录，以前的APP版本没有交易号，只能拿金额来判断 + if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') {//只判断前6位字符，CHTAPP-fr CHTAPP-jp等各语种都属于APP订单 + $this->Paypal_model->add_account_info_forAPP($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); + $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'Refunded'); + } else { + if (false == $this->Paypal_model->if_biz_gai_exists($item->pn_txn_id) ) { + $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'Refunded'); + } + $this->Paypal_model->add_account_info($GAI_COLI_SN, $advisor_info->COLI_ID, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, '', $item->pn_payer_email, $item->pn_txn_id, $ht_memo); + } + } + //更新还没有填的客邮和交易号de收款记录（传统订单） + elseif (isset($advisor_info->order_type) && $advisor_info->order_type == 1) { + $ht_memo = '退款交易号(自动录入):' . $item->pn_txn_id . "\n. "; + $ht_memo .= '原收款交易号(自动录入):' . $item->parent_txn_id; + $GAI_COLI_SN = isset($advisor_info->COLI_SN) ? $advisor_info->COLI_SN : 0; + $gai_sn = $this->Paypal_model->add_tour_account_info($GAI_COLI_SN, $item->pn_mc_gross, $item->pn_payment_date, mb_strtoupper($item->pn_mc_currency), $ssje, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payment_date, $item->pn_payer, $item->pn_payer_email, $item->pn_txn_id, $ht_memo); + //添加汉特的订单提醒 + $this->Paypal_model->update_coli_introduction($GAI_COLI_SN, '已退款 ' . mb_strtoupper($item->pn_mc_currency) . $item->pn_mc_gross); + } + } + + + $opi_email = !empty($advisor_info->OPI_Email) ? $advisor_info->OPI_Email : ''; //lussie@chinahighlights.net + $opi_firstname = !empty($advisor_info->OPI_FirstName) ? $advisor_info->OPI_FirstName : !empty($advisor_info->OPI_Name) ? $advisor_info->OPI_Name : ''; //lussie + + //没有外联信息表示订单未分配 + if (empty($opi_email) || empty($opi_firstname)) { + $this->Note_model->update_send($item->pn_txn_id, 'sendfail'); + return false; + } + + //添加邮件发送记录 + //给外联发送通知邮件 + $fromName = !empty($item->pn_payer) ? $item->pn_payer : ''; + $fromEmail = !empty($item->pn_payer_email) ? $item->pn_payer_email : ''; + $toName = !empty($opi_firstname) ? $opi_firstname : ''; + $toEmail = !empty($opi_email) ? $opi_email : ''; + $subject = $orderid_info->orderid . '_' . $orderid_info->ordertype . ' / ' . $item->pn_mc_gross . $item->pn_mc_currency . ' / ' . $fromName; + $body = $this->load->view('mail_templete', $item, true); //$item->pn_memo; + $M_RelatedInfo = $item->pn_sn; + $M_AddTime = $item->pn_payment_date; + $M_State = 0; + $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); + // TODO 通知财务, 如果已做账 + //添加邮件发送记录 end + + + return $this->Note_model->update_send($item->pn_txn_id, 'send'); + } + + public function trippest_note($orderid_info, $paypal_msg) + { + $send_type = ''; + $tp_orderid = ''; + $real_orderid = $orderid_info->orderid; + if (substr($orderid_info->orderid, 0, 2) == '01') { + $tp_orderid = "#" . substr($orderid_info->orderid, 10); + $real_orderid = ''; + } + // 获取HT订单号 + $ht_tp_order = $this->Paypal_model->get_trippest_order($tp_orderid, $real_orderid); + if (empty($ht_tp_order)) { + /** + * 此处不直接退出是为了:在(邮件订单不能自动录入/未收到新订单邮件)时也能通知外联已收款,防止漏单 + * 本方法内-以下的非空判断同理: !empty($ht_tp_order) + * * 未找到订单先邮件通知: pn_send='', 继续排队等待录入. 直到匹配订单变更为send + */ + // return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail'); + } else { + $tp_orderid = $ht_tp_order->COLI_PriceMemo; + $real_orderid = $ht_tp_order->COLI_ID; + //更新正确的订单信息到记录中，以这个为主 + $this->Note_model->set_invoice($paypal_msg->pn_txn_id, $ht_tp_order->COLI_ID . '_TP'); + } + $ssje = $this->Paypal_model->get_ssje($paypal_msg->pn_mc_gross, '15002', mb_strtoupper($paypal_msg->pn_mc_currency)); + $ht_memo = '交易号(自动录入):' . $paypal_msg->pn_txn_id; + if (false == $this->Paypal_model->if_biz_gai_exists($paypal_msg->pn_txn_id) ) { + if ( ! empty($ht_tp_order)) { + $this->Paypal_model->update_biz_coli_state($ht_tp_order->COLI_SN, 13); + $this->Paypal_model->insert_biz_order_log($ht_tp_order->COLI_SN, 'BS13'); + $this->Paypal_model->update_paymanner($ht_tp_order->COLI_SN, '15010'); + } + if (trim($paypal_msg->pn_send)!='' && trim($paypal_msg->pn_send)!='send') { + $opi_firstname = "David"; + $opi_email = "david@trippest.com"; + $fromName = !empty($paypal_msg->pn_payer) ? $paypal_msg->pn_payer : ''; + $fromEmail = !empty($paypal_msg->pn_payer_email) ? $paypal_msg->pn_payer_email : ''; + $toName = !empty($opi_firstname) ? $opi_firstname : ''; + $toEmail = !empty($opi_email) ? $opi_email : ''; + $subject = $real_orderid . $tp_orderid . '_' . $orderid_info->ordertype . ' / ' . $paypal_msg->pn_mc_gross . $paypal_msg->pn_mc_currency . ' / ' . $fromName; + $body = $this->load->view('mail_templete', $paypal_msg, true); //$paypal_msg->pn_memo; + $M_RelatedInfo = $paypal_msg->pn_sn; + $M_AddTime = $paypal_msg->pn_payment_date; + $M_State = 0; + $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); + empty($ht_tp_order) ? $send_type = "" : false ; // 未录订单先通知收款, 置为空继续排队 + } + } + if ( ! empty($ht_tp_order)) { + $this->Paypal_model->add_account_info( + $ht_tp_order->COLI_SN, + $ht_tp_order->COLI_ID, + $paypal_msg->pn_mc_gross, + $paypal_msg->pn_payment_date, + mb_strtoupper($paypal_msg->pn_mc_currency), + $ssje, + $paypal_msg->pn_payment_date, + $paypal_msg->pn_payment_date, + $paypal_msg->pn_payment_date, + '', + $paypal_msg->pn_payer_email, + $paypal_msg->pn_txn_id, + $ht_memo + ); + $send_type = "send"; + } + + $this->Note_model->update_send($paypal_msg->pn_txn_id, $send_type); + } + //所有记录列表 public function note_list() { + $this->permission->is_admin(true); $data = array(); //有关键词则不限制日期 $data['search_key'] = $this->input->post('search_key'); @@ -848,6 +1064,11 @@ class Index extends CI_Controller { $data['notelist'] = $this->Note_model->search_date($data['date']); } + /** + * 导出记录用的记录节点 + */ + $data['record_flags'] = $this->Note_model->list_export_record(); + $this->load->view('n-header', $data); $this->load->view('note_list'); $this->load->view('n-footer'); @@ -855,6 +1076,7 @@ class Index extends CI_Controller { //所有记录列表 public function note_faillist() { + $this->permission->is_admin(true); $data = array(); //有关键词则不限制日期 $data['search_key'] = $this->input->post('search_key'); @@ -868,6 +1090,7 @@ class Index extends CI_Controller { //获取note详情，修改各项数据 public function note_modal($pn_txn_id, $pn_invoice = false) { + $this->permission->is_admin(true); $data = array(); $data['pn_invoice'] = $pn_invoice; if (!empty($pn_txn_id)) { @@ -891,25 +1114,26 @@ class Index extends CI_Controller { //修改订单名 public function note_modal_save() { - $data = array(); - - $pn_txn_id = $this->input->post('pn_txn_id'); - $pn_invoice = $this->input->post('pn_invoice'); - - if (!empty($pn_txn_id) && !empty($pn_invoice)) { - $orderid_info = $this->analysis_orderid($pn_invoice); - if (!empty($orderid_info)) { - $orderid_info = json_decode($orderid_info); - $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); - if (!empty($advisor_info)) { - $this->Note_model->set_invoice($pn_txn_id, $pn_invoice); - $this->send_note($pn_txn_id); - echo json_encode('修改成功！'); - return true; - } - } - } - echo json_encode('没找到数据！'); + $this->gai_modal_save(); + // $data = array(); + + // $pn_txn_id = $this->input->post('pn_txn_id'); + // $pn_invoice = $this->input->post('pn_invoice'); + + // if (!empty($pn_txn_id) && !empty($pn_invoice)) { + // $orderid_info = $this->analysis_orderid($pn_invoice); + // if (!empty($orderid_info)) { + // $orderid_info = json_decode($orderid_info); + // $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype); + // if (!empty($advisor_info)) { + // $this->Note_model->set_invoice($pn_txn_id, $pn_invoice); + // $this->send_note($pn_txn_id); + // echo json_encode('修改成功！'); + // return true; + // } + // } + // } + // echo json_encode('没找到数据！'); } //关闭note通知，用于手动处理通知后 @@ -929,11 +1153,103 @@ class Index extends CI_Controller { $from_date = $this->input->post("from_date"); $to_date = $this->input->post("to_date"); $currency = $this->input->post("currency"); - $export_list = $this->Note_model->date_range($from_date, $to_date, $currency); + $amount = $this->input->post("set_amount"); + $last_record = $this->input->post("date_history"); + if (empty($amount)) { + $export_list = $this->Note_model->date_range($from_date, $to_date, $currency); + } else { + $allmost_day = intval(ceil($amount/10000)); + if ( ! in_array($currency, array('CNY','USD'))) { + $allmost_day = 30; + } + $last_sn = null; + $last_notice_sn = null; + $last_notice_record = array(); + if ( ! empty($last_record)) { + $selection_text = explode("@", $last_record); + $last_sn = $selection_text[0]; + $last_notice_record = $this->Note_model->list_export_record($last_sn); + if ( ! empty($last_notice_record[0])) { + $last_notice_sn = $last_notice_record[0]->TEL_transactionNoticeId; + // 查询导出记录时包含上次导出的最后一条. + // 因此目标金额设为本次的目标+上次已导出的部分 + // 得到结果集之后会把本次的第一条的金额重新计算,即减去上次已导出金额.下述 + $amount = bcadd($amount, $last_notice_record[0]->TEL_exportAmount); + $from_date = strstr($last_notice_record[0]->TEL_transactionDate, " ", TRUE); + $currency = $last_notice_record[0]->TEL_transactionCurrency; + } + } + $all_list = $this->target_amount_recursive($currency, $amount, 0, $from_date, $allmost_day, array(), $last_notice_sn); + $export_list = $all_list['list']; + // 修改导出的第一条记录, 金额改为剩余金额 + if ( ! empty($last_notice_record[0]) && $last_notice_record[0]->TEL_transactionNoticeId==$export_list[0]->pn_sn) { + $export_list[0]->pn_mc_gross = bcsub($last_notice_record[0]->TEL_transactionAmount, $last_notice_record[0]->TEL_exportAmount); + } + } if ($export_list == false) { echo "Not found any records for export."; return false; } + // 记录这次导出的最后一条 + if (isset($all_list['last_flag']) && ! empty($all_list['last_flag'])) { + $balance_diff = bcsub($all_list['now_amount'], $amount); + $last_record_export = bcsub($all_list['last_flag']->pn_mc_gross, $balance_diff); + $insert_db = array( + "TEL_transactionType" => 15002 + ,"TEL_transactionNoticeId" => $all_list['last_flag']->pn_sn + ,"TEL_transactionId" => $all_list['last_flag']->pn_txn_id + ,"TEL_transactionDate" => $all_list['last_flag']->pn_datetime + ,"TEL_transactionAmount" => $all_list['last_flag']->pn_mc_gross + ,"TEL_transactionCurrency" => $all_list['last_flag']->pn_mc_currency + ,"TEL_orderId" => $all_list['last_flag']->pn_invoice + ,"TEL_exportAmount" => $last_record_export + ,"TEL_exportDate" => date('Y-m-d H:i:s') + ); + $this->Note_model->export_record($insert_db); + // 修改导出的最后一条 + array_pop($export_list); + $all_list['last_flag']->pn_mc_gross = $last_record_export; + array_push($export_list, $all_list['last_flag']); + } + + $this->save_excel($export_list); + } + + /*! + * 递归查询收款记录, 直到总金额>=目标总金额 + * @date 2019-02-27 + */ + public function target_amount_recursive($currency, $target_amount, $now_amount, $from_date,$days=10,$list=array(), $last_sn=null, $last_flag=null) + { + $to_date = date('Y-m-d', strtotime("+$days days", strtotime($from_date))); + $former_list = $this->Note_model->date_range($from_date, $to_date, $currency, $last_sn); + $list_index = 0; + $last_sn = $last_sn===null ? 0 : $last_sn; + $last_flag = $last_flag===null ? null : $last_flag; + while ($now_amount < $target_amount && isset($former_list[$list_index])) { + $list[] = $former_list[$list_index]; + $now_amount = bcadd($now_amount, $former_list[$list_index]->pn_mc_gross); + $last_sn = $former_list[$list_index]->pn_sn; + $last_flag = $former_list[$list_index]; + $list_index++; + } + $ret = array( + "last_flag" => $last_flag, + "list" => $list, + "now_amount" => $now_amount + ); + if (empty($former_list)) { + return $ret; + } + if ($now_amount < $target_amount) { + return $this->target_amount_recursive($currency, $target_amount, $now_amount, $to_date, 10, $list, $last_sn, $last_flag); + } else { + return $ret; + } + } + + public function save_excel($export_list) + { $this->load->library('PHPExcel'); $objPHPExcel = new PHPExcel(); $objPHPExcel->setActiveSheetIndex(0); @@ -944,17 +1260,22 @@ class Index extends CI_Controller { $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(20); $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(30); $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(20); // 对齐 $objPHPExcel->getActiveSheet()->getStyle('B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); $objPHPExcel->getActiveSheet()->getStyle('C')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); + $objPHPExcel->getActiveSheet()->getStyle('D')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); // 表标题行 $objPHPExcel->getActiveSheet() ->SetCellValue('A1', '#') ->SetCellValue('B1', '团号') ->SetCellValue('C1', '金额') - ->SetCellValue('D1', '付款人') - ->SetCellValue('E1', '交易号') - ->SetCellValue('F1', '收单时间'); + ->SetCellValue('D1', '币种') + ->SetCellValue('E1', '付款人') + ->SetCellValue('F1', '付款人邮箱') + ->SetCellValue('G1', '交易号') + ->SetCellValue('H1', '收单时间'); $currency_sum = array(); bcscale(2); $rowCount = 2; @@ -966,11 +1287,14 @@ class Index extends CI_Controller { $orderid = $row->pn_invoice ? $row->pn_invoice : $row->pn_item_number; $objPHPExcel->getActiveSheet() ->SetCellValue('A'.$rowCount, ($rowCount-1)) + // ->SetCellValue('A'.$rowCount, $row->pn_sn) ->setCellValueExplicit('B'.$rowCount, $orderid,PHPExcel_Cell_DataType::TYPE_STRING) - ->setCellValueExplicit('C'.$rowCount, trim($row->pn_mc_currency) . number_format($row->pn_mc_gross, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('D'.$rowCount, $payer) - ->setCellValueExplicit('E'.$rowCount, $row->pn_txn_id,PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('F'.$rowCount, $row->pn_datetime); + ->setCellValue('C'.$rowCount, number_format($row->pn_mc_gross, 2, ".", "")) + ->setCellValueExplicit('D'.$rowCount, trim($row->pn_mc_currency) ,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('E'.$rowCount, $row->pn_payer) + ->SetCellValue('F'.$rowCount, $row->pn_payer_email) + ->setCellValueExplicit('G'.$rowCount, $row->pn_txn_id,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('H'.$rowCount, $row->pn_datetime); $payer = $orderid = ""; $rowCount++; } @@ -992,4 +1316,99 @@ class Index extends CI_Controller { $objWriter->save('php://output'); } + /** 查看收款记录的是否已录入到订单 */ + public function gai_modal($pn_txn_id=null, $pn_id = null, $neworder=null) + { + $this->permission->is_admin(true); + $data = array(); + $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id); + $orderid_info = $this->analysis_orderid($data['note']->pn_invoice); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'TP') { + $orderid_info->ordertype = 'B'; + } + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->Paypal_model->get_money_t($pn_txn_id); + } elseif ($orderid_info->ordertype === 'B') { + $data['gai_info'] = $this->Paypal_model->get_money_b($pn_txn_id); + } + } + $data['old_order'] = $data['note']->pn_invoice; + $data['new_order'] = $neworder; + $data['order_info'] = null; + if ($neworder !== null) { + $neworder_id = $this->analysis_orderid($neworder); + $neworder_id = json_decode($neworder_id); + if ($neworder_id->ordertype === 'TP') { + $neworder_id->ordertype = 'B'; + } + if ( ! empty($neworder_id)) { + $data['order_info'] = $this->Paypal_model->get_order($neworder_id->orderid, true, $neworder_id->ordertype); + } + } + echo json_encode($this->load->view('gai_setting', $data, true)); + } + public function gai_modal_save() + { + $data = array(); + $old_ssje = NULL; + $pn_txn_id = $this->input->post('pn_txn_id'); + $pn_id = $this->input->post('pn_id'); + $neworder = $this->input->post('pn_invoice'); + + $data['note'] = $this->Note_model->note($pn_txn_id, $pn_id); + $orderid_info = $this->analysis_orderid($data['note']->pn_invoice); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'TP') { + $orderid_info->ordertype = 'B'; + } + if ($orderid_info->ordertype === 'T') { + $data['gai_info'] = $this->Paypal_model->get_money_t($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->Paypal_model->delete_money_t($pn_txn_id); + } + } elseif ($orderid_info->ordertype === 'B') { + $data['gai_info'] = $this->Paypal_model->get_money_b($pn_txn_id); + if ( ! empty($data['gai_info'])) { + $old_ssje = $data['gai_info'][0]->GAI_SSJE; + $this->Paypal_model->delete_money_b($pn_txn_id); + } + } + } + + if (!empty($pn_txn_id) && !empty($neworder)) { + $orderid_info = $this->analysis_orderid($neworder); + if (!empty($orderid_info)) { + $orderid_info = json_decode($orderid_info); + if ($orderid_info->ordertype === 'TP') { + $orderid_info->ordertype = 'B'; + } + $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, TRUE); + if (!empty($advisor_info)) { + $this->Note_model->set_invoice($pn_txn_id, $neworder); + $this->send_note($pn_txn_id, $old_ssje); + echo json_encode('修改成功！'); + return true; + } + } + } + echo json_encode('没找到数据！'); + return; + } + public function closeGai($pn_txn_id) + { + $data = array(); + $data['note'] = $this->Note_model->note($pn_txn_id); + if (!empty($data['note'])) { + $this->Note_model->update_send($pn_txn_id, 'closeRecord'); + echo json_encode('该收款记录已经忽略！'); + return true; + } + echo json_encode('没找到数据！'); + return; + } + } diff --git a/webht/third_party/paypal/controllers/payment.php b/webht/third_party/paypal/controllers/payment.php index 9b5eb06a..cd08e942 100644 --- a/webht/third_party/paypal/controllers/payment.php +++ b/webht/third_party/paypal/controllers/payment.php @@ -5,7 +5,7 @@ if (!defined('BASEPATH')) class Payment extends CI_Controller { - public function __construct() + public function __construct() { parent::__construct(); $this->permission->is_admin(false); @@ -16,7 +16,7 @@ class Payment extends CI_Controller $data=array(); if ($this->input->post('price')) { //文字链接 - $paylink='https://www.chinahighlightstravel.com/payment/payment-center.asp?'. + $paylink='https://www.chinahighlights.com/securepayment/?'. 'Site_Language='.$this->input->post('lan').'&'. 'Site_CurrencyType='.$this->input->post('currency').'&'. 'Site_ACD=100-200-300&'. @@ -36,4 +36,4 @@ class Payment extends CI_Controller $this->load->view('n-footer'); } -} \ No newline at end of file +} diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index d5f6c022..0cd9ecd4 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -31,30 +31,31 @@ class Note_model extends CI_Model { public function unsend($topnum = 2) { $this->init(); $this->topnum = $topnum; - $this->pn_send = " AND (pn_send='unsend' OR pn_send='' OR pn_send IS NULL) "; + $this->pn_send = " AND (pn_send='unsend' OR pn_send IS NULL) "; return $this->get_list(); } public function failnote($topnum = 2) { $this->init(); $this->topnum = $topnum; - $this->pn_send = " AND pn_send='sendfail' "; + $this->pn_send = " AND (pn_send='sendfail' OR pn_send='') "; //$this->orderby = ' ORDER BY pn.pn_sn ASC '; return $this->get_list(); } public function search_date($date) { $this->init(); - $search_sql = " AND pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' "; + $search_sql = " AND (pn.pn_datetime BETWEEN '$date 00:00:00' AND '$date 23:59:59' OR pn_send not in ('send','closeRecord')) "; $this->search = $search_sql; $this->orderby=" ORDER BY CASE pn.pn_send WHEN 'sendfail' THEN 1 ELSE 2 END ,pn.pn_sn DESC "; return $this->get_list(); } - public function note($pn_txn_id){ + public function note($pn_txn_id, $pn_sn=NULL){ $this->init(); $this->topnum=1; $this->pn_txn_id=" AND pn.pn_txn_id=".$this->HT->escape($pn_txn_id); + $this->pn_txn_id .= ($pn_sn===NULL) ? "" : " AND pn.pn_sn=".$this->HT->escape($pn_sn); return $this->get_list(); } @@ -88,7 +89,7 @@ class Note_model extends CI_Model { ?,N?,N?,?,N?,N?,?,?,N?,N?,?, N?, GETDATE(),'unsend' ) "; - $query = $this->HT->query($sql, array($pn_txn_id, $pn_invoice, $pn_custom, $pn_mc_gross, $pn_item_name, $pn_item_number, $pn_mc_currency, $pn_payment_status, $pn_payer, $pn_payer_email, $pn_payment_date, $pn_memo)); + $query = $this->HT->query($sql, array($pn_txn_id, $pn_invoice, $pn_custom, $pn_mc_gross, mb_substr($pn_item_name, 0, 250) , $pn_item_number, $pn_mc_currency, $pn_payment_status, $pn_payer, $pn_payer_email, $pn_payment_date, $pn_memo)); $insertid = $this->HT->last_id('paypal_note'); return $query; } @@ -118,6 +119,7 @@ class Note_model extends CI_Model { $this->search ? $sql.=$this->search : false; $this->pn_txn_id ? $sql.=$this->pn_txn_id : false; $this->orderby ? $sql.=$this->orderby : false; +// log_message('error',$sql); $query = $this->HT->query($sql); //print_r($this->HT->queries); if ($this->topnum === 1) { @@ -151,7 +153,7 @@ class Note_model extends CI_Model { return $this->HT->query($sql, array($pn_invoice, $pn_txn_id)); } - public function date_range($from, $to, $currency=NULL) + public function date_range($from, $to, $currency=NULL, $pn_sn=NULL) { $this->init(); $search_sql = " AND pn_payment_status in ('Completed','Refunded') "; @@ -159,9 +161,34 @@ class Note_model extends CI_Model { if ( ! empty($currency)) { $search_sql .= " AND pn_mc_currency = '$currency' "; } + if ( ! empty($pn_sn)) { + $search_sql .= " AND pn_sn >= $pn_sn "; + } $this->search = $search_sql; - $this->orderby = ""; + $this->orderby = " order by pn.pn_sn asc"; return $this->get_list(); } + + /** + * export note + */ + public function export_record($db) + { + $this->info = $this->load->database('INFO', TRUE); + $this->info->insert('Transaction_Export_Log', $db); + } + + public function list_export_record($sn=0) + { + $this->info = $this->load->database('INFO', TRUE); + $search_sql = $sn===0 ? "" : " and TEL_SN=$sn "; + $sql = "SELECT TOP 10 * + FROM [InfoManager].[dbo].[Transaction_Export_Log] + WHERE 1=1 + $search_sql + order by TEL_SN desc"; + return $this->info->query($sql)->result(); + } + } diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php index af3f95b5..df8808e5 100644 --- a/webht/third_party/paypal/models/paypal_model.php +++ b/webht/third_party/paypal/models/paypal_model.php @@ -14,12 +14,12 @@ class Paypal_model extends CI_Model { } //根据订单号获取外联邮箱 - public function get_order($COLI_ID, $orderinfo = false, $ordertype = 'N') { + public function get_order($COLI_ID, $orderinfo = false, $ordertype = 'N', $handpick=false) { $result = ''; $fieldsql = $orderinfo == false ? '' : " ,* "; //先查商务订单B,APP订单A、再查传统订单T if ($ordertype == 'B' || $ordertype == 'A') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_PayManner,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_ID =?"; $query = $this->HT->query($sql, array($COLI_ID)); @@ -27,17 +27,21 @@ class Paypal_model extends CI_Model { } //后查传统订单的原因是因为传统订单的订单号去掉外联名字首字母后可能会和商务订单的重合。 if (empty($result) && ($ordertype == 'T')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN - where COLI_ID like '%$COLI_ID'"; + where COLI_ID like '%$COLI_ID' + order by CHARINDEX('$COLI_ID', COLI_ID) "; $query = $this->HT->query($sql); $result = $query->result(); + if ($handpick === TRUE) { + $result = array($result[0]); + } } //查传统订单add_code，网前实时支付会先生成一个临时订单号存在add_code里，如订单45103248 if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_AddCode =? "; $query = $this->HT->query($sql, array($COLI_ID)); @@ -45,7 +49,7 @@ class Paypal_model extends CI_Model { } if (empty($result) && ($ordertype == 'M')) { - $sql = "SELECT TOP 1 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli + $sql = "SELECT TOP 2 1 as order_type, COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode $fieldsql from ConfirmLineInfo cli LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where EXISTS ( @@ -61,7 +65,7 @@ class Paypal_model extends CI_Model { //订单号查询不到尝试使用团号查询 if (empty($result) && $ordertype == 'B') { - $sql = "SELECT TOP 1 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_State $fieldsql from BIZ_ConfirmLineInfo + $sql = "SELECT TOP 2 0 as order_type,COLI_SN,COLI_ID,OPI_Email,OPI_FirstName,OPI_Name,COLI_WebCode,COLI_Department,COLI_State $fieldsql from BIZ_ConfirmLineInfo LEFT JOIN OperatorInfo ON COLI_OPI_ID=OPI_SN where COLI_GroupCode like '%-$COLI_ID%'"; $query = $this->HT->query($sql); @@ -69,10 +73,14 @@ class Paypal_model extends CI_Model { } //团号查询不到尝试使用客人邮箱查询(预订多次的老客户得按日期新旧排序，取最新的数据) - if (!empty($result)) { + if (!empty($result) && is_array($result) ) { //print_r($result[0]); //die(); - $result = $result[0]; + if (count($result) > 1) { + $result = array(); + } else { + $result = $result[0]; + } } return $result; @@ -118,14 +126,33 @@ class Paypal_model extends CI_Model { //修改订单状态 public function update_biz_coli_state($coli_sn, $coli_state) { $sql = " - UPDATE BIZ_ConfirmLineInfo - SET COLI_State = ? - WHERE COLI_SN = ? + IF EXISTS + ( SELECT OPI_DEI_SN + FROM OperatorInfo + INNER JOIN BIZ_ConfirmLineInfo ON OPI_SN=COLI_OPI_ID + WHERE COLI_SN=? AND OPI_DEI_SN=10 + ) + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? + WHERE COLI_SN=? + ELSE + UPDATE BIZ_ConfirmLineInfo + SET COLI_State=? WHERE COLI_SN=? + AND COLI_State IN (0,1,11,12,13,14,40,50,60,101,102,999) "; - $query = $this->HT->query($sql, array($coli_state, $coli_sn)); + $query = $this->HT->query($sql, array($coli_sn, $coli_state, $coli_sn, $coli_state, $coli_sn)); return $query; } + public function if_biz_gai_exists($GAI_AccreditNo) + { + $sql = " SELECT TOP 1 1 FROM BIZ_GroupAccountInfo + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') + AND DeleteFlag=0"; + $result = $this->HT->query($sql, array($GAI_AccreditNo)); + return ($result->num_rows() > 0); + } + //添加收款记录(商务订单),APP会自动增加记录，所以添加前根据金额来判断是否有重复记录 public function add_account_info_forAPP($GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo) { //先判断是否有这条数据 @@ -133,7 +160,7 @@ class Paypal_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupAccountInfo - WHERE GAI_COLI_SN = ? AND GAI_SQJE=? + WHERE GAI_COLI_SN = ? AND GAI_SQJE=? AND DeleteFlag=0 AND GAI_Type='15010' ) INSERT INTO BIZ_GroupAccountInfo ( GAI_COLI_SN @@ -166,7 +193,7 @@ class Paypal_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM BIZ_GroupAccountInfo - WHERE GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%' + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') AND DeleteFlag=0 ) INSERT INTO BIZ_GroupAccountInfo ( GAI_COLI_SN @@ -185,7 +212,7 @@ class Paypal_model extends CI_Model { ,GAI_Memo ,GAI_State ,DeleteFlag - ) VALUES (?,?,15010,?,?,?,?,?,?,?,?,?,?,?,0,0)"; + ) VALUES (?,?,15002,?,?,?,?,?,?,?,?,?,?,?,0,0)"; $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_COLI_ID, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('BIZ_GroupAccountInfo'); return $query; @@ -199,7 +226,7 @@ class Paypal_model extends CI_Model { IF NOT EXISTS( SELECT TOP 1 1 FROM GroupAccountInfo - WHERE GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%' + WHERE (GAI_AccreditNo = ? OR GAI_Memo LIKE '%$GAI_AccreditNo%') and DeleteFlag=0 ) INSERT INTO GroupAccountInfo ( GAI_COLI_SN @@ -220,7 +247,7 @@ class Paypal_model extends CI_Model { ) VALUES (?,15002,?,?,?,?,?,?,?,?,?,?,?,0,0)"; $query = $this->HT->query($sql, array($GAI_AccreditNo, $GAI_COLI_SN, $GAI_SQJE, $GAI_SQDate, $GAI_SQJECurrency, $GAI_SSJE, $GAI_SSDate, $GAI_AccountDate, $GAI_SubmitDate, $GAI_CusName, $GAI_CusEmail, $GAI_AccreditNo, $GAI_Memo)); $insertid = $this->HT->last_id('GroupAccountInfo'); - return $query; + return $insertid; } //更新线路提醒 @@ -254,10 +281,6 @@ class Paypal_model extends CI_Model { return $query; } - public function note_list() { - - } - public function save_paypal_msg($pm_transaction_id, $pm_orderid, $pm_item_name, $pm_money, $pm_currency, $pm_payer, $pm_payer_email, $pm_payer_status, $pm_memo, $pm_payment_date, $pm_pay_type) { $sql = "INSERT INTO paypal_msg ( pm_transaction_id @@ -521,4 +544,71 @@ class Paypal_model extends CI_Model { $query = $this->HT->query($sql, array($paymanner, $COLI_SN)); return $query; } + //根据交易号获取收款记录(传统订单) + public function get_money_t($pn_invoice) { + $sql = "SELECT GroupAccountInfo.* + from GroupAccountInfo + where DeleteFlag=0 and GAI_AccreditNo=? + "; + $query = $this->HT->query($sql, array($pn_invoice)); + $result = $query->result(); + return $result; + } + //根据交易号获取收款记录(商务订单) + public function get_money_b($pn_invoice) { + $sql = "SELECT BIZ_GroupAccountInfo.* + from BIZ_GroupAccountInfo + where DeleteFlag=0 and GAI_AccreditNo=? + "; + $query = $this->HT->query($sql, array($pn_invoice)); + $result = $query->result(); + return $result; + } + /** 删除收款记录 */ + public function delete_money_t($deadId) + { + $sql = "UPDATE GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + public function delete_money_b($deadId) + { + $sql = "UPDATE BIZ_GroupAccountInfo SET DeleteFlag=1 WHERE GAI_AccreditNo=?"; + $query = $this->HT->query($sql, array($deadId)); + return $query; + } + + /** JJH: 添加订单收款记录之后执行 */ + public function exec_addToTask($GAI_SN) + { + $sql = " if not exists ( + select top 1 1 from Sysautotask + where SAT_Type=1 and SAT_SourceSN=$GAI_SN + ) exec SP_AddToSystask 1," . $GAI_SN; + $query = $this->HT->query($sql); + return $query; + } + + /** 写入商务订单操作记录 */ + public function insert_biz_order_log($coli_sn, $log_info) + { + $db_column = array( + "BOL_COLI_SN" => $coli_sn + ,"BOL_OPI_SN" => 0 + ,"BOL_OPType" => $log_info + ,"BOL_OPTime" => date('Y-m-d H:i:s') + ,"BOL_Creator" => 0 + ,"BOL_CreateTime" => date('Y-m-d H:i:s') + ); + return $this->HT->insert("BIZ_OrderOperationLog", $db_column); + } + + public function get_trippest_order($tp_order='', $real_orderid='') + { + $sql = "SELECT top 1 * from BIZ_ConfirmLineInfo + WHERE 1=1 "; + $tp_order ? $sql.=" and COLI_PriceMemo=$tp_order " : ""; + $real_orderid ? $sql.=" and COLI_ID=$real_orderid " : ""; + return $this->HT->query($sql)->row(); + } } diff --git a/webht/third_party/paypal/views/gai_setting.php b/webht/third_party/paypal/views/gai_setting.php new file mode 100644 index 00000000..e11d0137 --- /dev/null +++ b/webht/third_party/paypal/views/gai_setting.php @@ -0,0 +1,41 @@ +
    + +

    已录入订单

    + + + + + + + + + +
    申请金额/币种实收金额
    GAI_SQJE; ?> GAI_SQJECurrency; ?>GAI_SSJE; ?> CNY
    +

    撤回以上订单收款记录, 并转移到订单:

    + +

    未自动录入到订单

    + +
    + + +
    + +
    订单详细内容:
    +

    + $order_info->COLI_SN
    "; + echo "COLI_ID => $order_info->COLI_ID
    "; + echo "OPI_Email => $order_info->OPI_Email
    "; + echo "OPI_Name => $order_info->OPI_Name
    "; + echo!empty($order_info->COLI_GroupCode) ? "COLI_GroupCode => $order_info->COLI_GroupCode
    " : false; + echo!empty($order_info->COLI_OrderDetailText) ? "COLI_OrderDetailText => $order_info->COLI_OrderDetailText\n" : false; + } else { + echo '找不到目标订单内容'; + } + ?> +

    + + +
    diff --git a/webht/third_party/paypal/views/note_list.php b/webht/third_party/paypal/views/note_list.php index 0d8a07ce..70dcc979 100644 --- a/webht/third_party/paypal/views/note_list.php +++ b/webht/third_party/paypal/views/note_list.php @@ -1,6 +1,7 @@ -
    -
    -
    - - -
    -
    - - -
    -
    - - + + + + +
    @@ -123,8 +184,8 @@
  • 客人邮箱
  • 交易号
  • 收款(北京)时间
    • -
  • 通知时间
    • -
  • 通知状态
    • +
  • 通知时间
    • +
  • 通知状态
    • pn_txn_id; ?>
  • pn_payment_date) + 3600 * 8); ?>
    • -
  • pn_datetime; ?>
    • -
  • +
  • pn_datetime; ?>
    • +
  • pn_send == 'send') { $show_send = $item->pn_send; + } elseif ($item->pn_send == 'closeRecord') { + $show_send = $show_record = '已忽略'; } else if ($item->pn_payment_status == 'Completed') { $class_css = 'btn-danger'; $show_send = $item->pn_send; @@ -157,6 +221,12 @@ $show_send = $item->pn_payment_status; } ?> +
    + + +
    • @@ -186,8 +256,57 @@
    + + + + + + + diff --git a/webht/third_party/workflow/controllers/index.php b/webht/third_party/workflow/controllers/index.php index c37ca49a..0f209053 100644 --- a/webht/third_party/workflow/controllers/index.php +++ b/webht/third_party/workflow/controllers/index.php @@ -15,7 +15,11 @@ class Index extends CI_Controller $this->permission->is_admin(false); $this->load->model('workflow_model'); } - + + public function test(){ + $this->workflow_model->delete_test(); + } + //首页 public function index() { @@ -24,6 +28,7 @@ class Index extends CI_Controller } $data=array(); $typelist=$this->workflow_model->get_type_list('all'); + //print_r($typelist); $data['typelist']=array(); foreach ($typelist as $t) { $data['typelist'][$t->wt_parentid][]=$t; @@ -62,7 +67,12 @@ class Index extends CI_Controller //添加一个具体事务到数据库 public function do_add_work() - { + { + + $this->load->model('operator_model'); + $current_user=$this->input->post('wf_user'); + $tmp = $this->operator_model->get_user_by_name($current_user); + //判断是不是补填的值班记录 if ($this->input->post('mail_title')=='值班记录') { //本月和上个月的值班表(有可能本月初和上月尾是连着的假期) @@ -73,27 +83,32 @@ class Index extends CI_Controller $data['flow_data'][]=$this->workflow_model->get_work_flow_data($v->wf_sn); } //节假日列表 - $needdate_list=array(); + $needdate_list=$myrota=array(); foreach ($data['flow_data'] as $f) { foreach ($f as $d) { $wfd_key_arr=explode('_', $d->wfd_key); + //值班日期是周末的日期集合 if ($wfd_key_arr[0]=='weekend' && $d->wfd_value==1) { $wfd_key_arr[1]=strlen($wfd_key_arr[1])==7?substr($wfd_key_arr[1], 0,-1).'0'.substr($wfd_key_arr[1],-1):$wfd_key_arr[1]; $needdate_list[]=$wfd_key_arr[1]; } + //当前用户的值班日期集合 + $name_string=str_replace('惠毅', '惠毅;惠 毅', $d->wfd_value); + if (!empty($d->wfd_value) && stripos($name_string, $tmp['OPI_Name'])!==false && isset($wfd_key_arr[2]) && is_numeric($wfd_key_arr[2])) { + $need_date=strlen($wfd_key_arr[2])==7?substr($wfd_key_arr[2], 0,-1).'0'.substr($wfd_key_arr[2],-1):$wfd_key_arr[2]; + $myrota[]=date('Ymd',strtotime($need_date)); + } } } + $needdate_list=array_intersect($needdate_list,$myrota); $zhiban_date=date('Ymd',strtotime($this->input->post('wf_time'))); - if (!in_array($zhiban_date, $needdate_list)) { - echo json_encode(array('status'=>'no','msg'=>'请把左上角的日期改为你值班当天的日期')); - return true; + if (empty($needdate_list) or !in_array($zhiban_date, $needdate_list)) { + //echo json_encode(array('status'=>'no','msg'=>'值班日期与值班表不符，更换了值班的同学请更改值班表')); + //return true; } } //保存任务 - $this->load->model('operator_model'); - $current_user=$this->input->post('wf_user'); - $tmp = $this->operator_model->get_user_by_name($current_user); $wf_user=$tmp['OPI_SN']; $wf_time=strtotime($this->input->post('wf_time')); $group_admin=explode('@', $this->input->post('wf_wt_sn')); @@ -108,10 +123,13 @@ class Index extends CI_Controller if ($wfd_key=='emailcontent') { $wfd_value=htmlspecialchars($wfd_value); } - $col_val.="('".trim($wfd_key)."','".$wfd_value."',".$wfd_wf_sn."),"; + // $col_val.="('".trim($wfd_key)."','".$wfd_value."',".$wfd_wf_sn."),"; + $col_val.="('".trim($wfd_key)."','".chop($wfd_value)."',".$wfd_wf_sn."),";//csk 2016-9-22 去掉末尾的换行和空格 $mail_data[$wfd_key]=$wfd_value; $mail_data['flow_data'][$wfd_key]=$wfd_value; + $mail_data['flow_data'][$wfd_key]=chop($wfd_value);//csk 2016-9-22 去掉末尾的换行和空格 } + $apply_user=$this->input->post('apply_user'); if (empty($apply_user)) { $col_val.="('apply_user','".$current_user."',".$wfd_wf_sn."),"; @@ -123,7 +141,6 @@ class Index extends CI_Controller //添加审核人 $typeinfo=$this->workflow_model->get_type_list(0,$wf_wt_sn); $verify_tolist_array=$this->get_verify_admin_list($wfd_wf_sn,$group_admin[1],$typeinfo[0]->wt_linear); - //抄送邮件给指定人员 if ($wfd_wf_sn && $wfd_sn) { $data['userdata']=$this->session->userdata('admin_chtcdn'); @@ -177,6 +194,7 @@ class Index extends CI_Controller } $data['userdata']=$this->session->userdata('admin_chtcdn'); + //print_r($data['userdata']); //事务申请人信息 $userdata=$this->session->userdata('admin_chtcdn'); $flow=$this->workflow_model->get_work_list($userdata['OPI_SN'],$wv_status,$wf_sn); @@ -189,6 +207,7 @@ class Index extends CI_Controller $data[$d->wfd_key]=$d->wfd_value; $data['flow_data'][$d->wfd_key]=$d->wfd_value; } + //print_r($data); $form=$data['flow']->wt_form; $data['wf_sn']=$wf_sn; @@ -201,12 +220,16 @@ class Index extends CI_Controller //当前用户是否审核人员 0否 1是 $verify_user=$this->workflow_model->get_verify($wf_sn,0,false,50); $data['is_verify_user']=0; - foreach ($verify_user as $vu) { + // var_dump($data['userdata']);die; + if(!empty($data['userdata']['whu_uid'])){//csk2016-11-29 + foreach ($verify_user as $vu) { if ($data['userdata']['whu_uid']==$vu->wv_admin) { $data['is_verify_user']=1; break; } + } } + //用于做导航激活状态 $data['nav_type']=$nav_type; if ($nav_type=='userlist') { @@ -222,6 +245,7 @@ class Index extends CI_Controller } $data['wv_status']=$wv_status; $data['form']=$this->load->view("form/$form",$data,true); + //print_r($data); $this->load->view('n-header', $data); $this->load->view('w-nav'); $this->load->view('w-left'); @@ -313,7 +337,7 @@ class Index extends CI_Controller $namestrings=str_replace('；', ';', $namestrings); $namestrings=str_replace('（', '(', $namestrings); $namestrings=str_replace('）', ');', $namestrings); - $namestrings=str_replace('惠毅', '惠 毅', $namestrings); + //$namestrings=str_replace('惠毅', '惠 毅', $namestrings); $namestrings=str_replace("\n", ";", $namestrings); $namestrings=str_replace("\r", ";", $namestrings); $namestrings_arr=explode(';', $namestrings); @@ -336,9 +360,6 @@ class Index extends CI_Controller } if (isset($atd_sn_arr[0]->ATT_SN) && isset($epy_sn_arr[0]->EPY_ID)) { $jabtime=7; - if ($workdata[0]->OPI_Name=='周玲霞') { - $jabtime=3.5; - } //如果有自定义的考勤时间则使用自定义的数据 $kaoqin_time=$this->input->post('kaoqin_time')?$this->input->post('kaoqin_time'):''; $kaoqin_time=trim($kaoqin_time); @@ -467,6 +488,7 @@ class Index extends CI_Controller return $verify_tolist_array; } + // public function other_verify($wf_sn,$wv_status=0) { //获取当前值班名单 @@ -542,9 +564,9 @@ class Index extends CI_Controller array_multisort($datetemp3, SORT_ASC, $js_uname_list); $data['en_uname_list']=$en_uname_list; - $data['sw_uname_list']=$sw_uname_list; - $data['jd_uname_list']=$jd_uname_list; - $data['js_uname_list']=$js_uname_list; + $data['sw_uname_list']=array();//$sw_uname_list; + $data['jd_uname_list']=array();//$jd_uname_list; + $data['js_uname_list']=array();//$js_uname_list; $data['wf_sn']=$wf_sn; $data['nav_type']='rata_list'; @@ -624,6 +646,7 @@ class Index extends CI_Controller //分页 $page_flag=true; $list=$this->workflow_model->get_work_list($userdata['whu_uid'],$wv_status,false,$page_flag,false); + //print_r($list); $pages['total']=count($list);//数据总条数 $pages['pageSize']= 30;//每页展示数量 $pages['url'] = site_url("apps/workflow/index/unverify/$wv_status/");//页码链接 @@ -638,18 +661,34 @@ class Index extends CI_Controller } $datalist=$this->workflow_model->get_work_list_by_sn($task_id_str); $worklist=array(); + $wf_sn_str='0'; foreach ($datalist as $wlist) { $worklist[$wlist->wf_sn]=$wlist; + $wf_sn_str.=','.$wlist->wf_sn; } + $data['list']=$worklist; - + $flow_data=$this->workflow_model->get_work_flow_data($wf_sn_str); + + $f_datas=array(); + foreach ($flow_data as $k => $f) { + $f_datas[$f->wfd_wf_sn][$f->wfd_key]=$f->wfd_value; + } + $data['f_datas']=$f_datas; + $data['nav_type']='verify'; $data['left_nav']=$wv_status==0?'unverify':'verify'; $data['wv_status']=$wv_status; + //print_r($data); if ($wv_status==1) { $data['nav_type']='verifyed'; } - + // var_dump($data["list"]); + // foreach ($data["list"] as $key => $v) { + // echo $v->wf_status; + // echo $v->isverify; + // echo "
    "; + // } $this->load->view('n-header', $data); $this->load->view('w-nav'); $this->load->view('w-left'); @@ -847,10 +886,11 @@ class Index extends CI_Controller $data['rolelist']=$this->workflow_model->get_department_list(2); //用户列表 $data['userlist']=$this->workflow_model->get_user_list(); + if ($whu_uid!==false) { $data['userinfo']=$this->workflow_model->get_user_list($whu_uid); - $data['userinfo']=$data['userinfo'][0]; - $data['userrole']=array_filter(explode(',', $data['userinfo']->role)); + $data['userinfo']=$data['userinfo'][0]; + $data['userrole']=array_filter(explode(',', $data['userinfo']->role)); } $this->load->view('n-header', $data); $this->load->view('w-nav'); @@ -863,6 +903,7 @@ class Index extends CI_Controller //员工资料更新 public function user_edit() { + $type=$this->input->post('type'); $whu_role=$this->input->post('userrole'); $whu_uname=$this->input->post('whu_uname'); $whu_email=$this->input->post('whu_email'); @@ -870,11 +911,19 @@ class Index extends CI_Controller $department=$this->input->post('department'); $role=!empty($whu_role)?implode(',',$this->input->post('userrole')):NULL; $whu_uid=$this->input->post('whu_uid'); - $result=$this->workflow_model->update_webuser($whu_uname,$whu_email,$whu_ip,$department,$role,$whu_uid); + if($type == 'add'){ + $result = $result=$this->workflow_model->add_webuser($whu_uname,$whu_email,$whu_ip,$department,$role,$whu_uid); + }else if($type == 'delete'){ + $result=$this->workflow_model->delete_webuser($whu_uname,$whu_uid); + + }else if($type == 'update'){ + $result=$this->workflow_model->update_webuser($whu_uname,$whu_email,$whu_ip,$department,$role,$whu_uid); + } + if ($result) { - echo json_encode(array('status'=>'ok','msg'=>'保存成功!')); + echo json_encode(array('status'=>'ok','msg'=>'操作成功!')); }else{ - echo json_encode(array('status'=>'no','msg'=>'保存失败!')); + echo json_encode(array('status'=>'no','msg'=>'操作失败!')); } } @@ -1001,8 +1050,8 @@ class Index extends CI_Controller //发送邮件 $mail_tpl='rota.php'; - $subject='电子商务部'.date('n',$wf_time).'月值班安排'; - $html='各位同事，
    以下是电子商务部'.date('Y',$wf_time).'年'.date('n',$wf_time).'月值班安排，请大家做好提醒，按相关值班规定值班。
    为方便统计加班小时数，请记得到值班记录系统填写值班记录，自行调班的同事请记得到值班记录系统里面更改。
    谢谢！'; + $subject='海纳国旅'.date('n',$wf_time).'月值班安排'; + $html='各位同事，
    以下是海纳国旅'.date('Y',$wf_time).'年'.date('n',$wf_time).'月值班安排，请大家做好提醒，按相关值班规定值班。
    为方便统计加班小时数，请记得到值班记录系统填写值班记录，自行调班的同事请记得到值班记录系统里面更改。
    谢谢！'; $mailbody=$html.'

    '.$this->load->view("mail_tpl/$mail_tpl",$mail_data,true); //发送人信息 @@ -1032,13 +1081,16 @@ class Index extends CI_Controller if ($this->workflow_model->delete_wfd($wf_sn)) { $col_val=''; foreach ($this->input->post() as $wfd_key => $wfd_value) { - $col_val.="('".trim($wfd_key)."','".$wfd_value."',".$wf_sn."),"; + // $col_val.="('".trim($wfd_key)."','".$wfd_value."',".$wf_sn."),"; + + $col_val.="('".trim($wfd_key)."','".chop($wfd_value)."',".$wf_sn."),";//csk 2016-9-22 去掉末尾的换行和空格 } $apply_user=$this->input->post('apply_user'); if (empty($apply_user)) { $col_val.="('apply_user','".$current_user."',".$wf_sn."),"; } $col_val=substr($col_val, 0, -1); + $wfd_sn=$this->workflow_model->add_work_data($col_val); } @@ -1053,6 +1105,7 @@ class Index extends CI_Controller if ($this->session->userdata('verify_referer')) { $verify_referer_url=$this->session->userdata('verify_referer'); } + echo json_encode(array('status'=>'ok_go','msg'=>'更新成功!','url'=>$verify_referer_url)); } @@ -1413,5 +1466,6 @@ class Index extends CI_Controller } $this->load->view('index/print_text', $data); } - + + } diff --git a/webht/third_party/workflow/models/workflow_model.php b/webht/third_party/workflow/models/workflow_model.php index 3da7b4b6..da3c6732 100644 --- a/webht/third_party/workflow/models/workflow_model.php +++ b/webht/third_party/workflow/models/workflow_model.php @@ -100,7 +100,7 @@ class Workflow_model extends CI_Model { } public function get_work_list($wv_admin,$wv_status,$wf_sn=false,$page_flag=false,$wv_actived=-1) - { + {// $map=" AND wt_form!='rota.php' AND (wv_admin=258 or wv_admin='$wv_admin')"; if (!$wv_actived) { $map.=" AND wv_actived!=-1 "; @@ -117,7 +117,7 @@ class Workflow_model extends CI_Model { left join work_type on wf_wt_sn=wt_sn left join OperatorInfo on wf_user=OPI_SN WHERE wv_status=? $map - ORDER BY wf_time desc"; + ORDER BY wf_time desc"; $query = $this->HT->query($sql, array($wv_status)); $result=$query->result(); return $result; @@ -411,6 +411,34 @@ class Workflow_model extends CI_Model { $query = $this->HT->query($sql,array($whu_uname,$whu_email,$whu_ip,$department,$role,$whu_uid)); return $query; } + + public function add_webuser($whu_uname,$whu_email,$whu_ip,$department,$role) + { + $status = 1; + $sql="INSERT INTO webht_user + (whu_uname, + whu_email, + whu_ip, + whu_status, + department, + role) + VALUES + (?,?,?,?,?,?)"; + $query = $this->HT->query($sql,array($whu_uname,$whu_email,$whu_ip,$status,$department,$role)); + return $query; + } + + public function delete_webuser($whu_uname,$whu_uid) + { + $sql="DELETE FROM + webht_user + WHERE + whu_uname=? + and + whu_uid=?"; + $query = $this->HT->query($sql,array($whu_uname,$whu_uid)); + return $query; + } public function delete_wt($wt_sn,$wt_isdelete=1) { @@ -437,5 +465,10 @@ class Workflow_model extends CI_Model { $query=$this->HT->query($sql, array($wv_wf_sn)); return $query; } + + public function delete_test(){ + $sql = "delete from work_flow_data where wfd_key like '%201905%'"; + $query=$this->HT->query($sql); + } } \ No newline at end of file diff --git a/webht/third_party/workflow/views/form/rota.php b/webht/third_party/workflow/views/form/rota.php index 91ae4018..8d36ad27 100644 --- a/webht/third_party/workflow/views/form/rota.php +++ b/webht/third_party/workflow/views/form/rota.php @@ -5,7 +5,7 @@
    CH销售 CT 商务 - 德语 国际 技术 计调 + APP + 目的地 + 亚洲事业部 值班时间 12点-13点 9:30-12:00,13:00-17:00 - 10:00-16:00 + 10:00-16:00 到办公室 VPN 技术远程值班 无团电话值班 + VPN(8:30-23:00) + VPN(8:30-23:00) + VPN(8:30-23:00) - > + > @@ -89,9 +96,6 @@ - - - @@ -104,6 +108,15 @@ + + + + + + + + + diff --git a/webht/third_party/workflow/views/index/rata_list.php b/webht/third_party/workflow/views/index/rata_list.php index f897cfee..37e506a3 100644 --- a/webht/third_party/workflow/views/index/rata_list.php +++ b/webht/third_party/workflow/views/index/rata_list.php @@ -5,7 +5,8 @@ 提交时间 状态 操作 - 其他 + 其他 + session->userdata('admin_chtcdn'); ?> $v) { ?> @@ -23,7 +24,11 @@ 删除 - 不用发邮件记录考勤的员工 + + + 中午值班审核 + + diff --git a/webht/third_party/workflow/views/index/unverify.php b/webht/third_party/workflow/views/index/unverify.php index e37e0edc..98e05a90 100644 --- a/webht/third_party/workflow/views/index/unverify.php +++ b/webht/third_party/workflow/views/index/unverify.php @@ -6,9 +6,14 @@ 状态 操作 - $v) { ?> + $v) { ?> - + + + + + + wt_name.'('.$v->OPI_Name.')'; ?> wf_time); ?> wf_status==0? ($v->isverify!=1?'还没处理':'处理中'):'已审核';echo $status; ?> @@ -20,6 +25,15 @@ + + + + session->userdata('admin_chtcdn'); if (isset($left_nav) && $left_nav=='unverify' && ($userdata['OPI_Name']=='侯敏' || $userdata['OPI_Name']=='王婷' )) { ?> + 批量审核 + 审核不通过 + + + @@ -29,4 +43,52 @@ -
    \ No newline at end of file +
    + + \ No newline at end of file diff --git a/webht/third_party/workflow/views/index/user_manage.php b/webht/third_party/workflow/views/index/user_manage.php index e34bf2e7..4fde522d 100644 --- a/webht/third_party/workflow/views/index/user_manage.php +++ b/webht/third_party/workflow/views/index/user_manage.php @@ -20,7 +20,14 @@
    员工资料编辑 - + +
    +
    +
    @@ -63,16 +70,117 @@
    - - - + + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + + +
    +
    +
    + +
    +
    + + + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + + +
    +
    +
    + +
    +
    + + + + +
    +
    +
    +
    +
    + +
    diff --git a/webht/third_party/workflow/views/index/verify.php b/webht/third_party/workflow/views/index/verify.php index 17024a14..cb3a6ee5 100644 --- a/webht/third_party/workflow/views/index/verify.php +++ b/webht/third_party/workflow/views/index/verify.php @@ -31,9 +31,11 @@
    - + - + diff --git a/webht/third_party/workflow/views/mail_tpl/rota.php b/webht/third_party/workflow/views/mail_tpl/rota.php index 9d92193a..83bbc015 100644 --- a/webht/third_party/workflow/views/mail_tpl/rota.php +++ b/webht/third_party/workflow/views/mail_tpl/rota.php @@ -23,6 +23,7 @@ table th,table td{padding: 5px;font-size: 12px;text-align: center;vertical-align 国际 技术 计调 + APP 值班时间 @@ -33,6 +34,7 @@ table th,table td{padding: 5px;font-size: 12px;text-align: center;vertical-align VPN 技术远程值班 无团电话值班 + VPN(8:30-23:00) @@ -63,6 +66,7 @@ table th,table td{padding: 5px;font-size: 12px;text-align: center;vertical-align

    +

    \ No newline at end of file diff --git a/webht/third_party/workflow/views/w-left.php b/webht/third_party/workflow/views/w-left.php index f54dc2be..e4a3ce23 100644 --- a/webht/third_party/workflow/views/w-left.php +++ b/webht/third_party/workflow/views/w-left.php @@ -8,7 +8,10 @@
    • - session->userdata('admin_chtcdn'); if ($userdata['whu_isadmin']==1) { ?> + session->userdata('admin_chtcdn'); + if ( !empty($userdata['whu_isadmin']) && $userdata['whu_isadmin']==1) { + ?>
    • diff --git a/webht/views/demandform/index.php b/webht/views/demandform/index.php new file mode 100644 index 00000000..2dfb008b --- /dev/null +++ b/webht/views/demandform/index.php @@ -0,0 +1,160 @@ + + + + + + + + We Complete You + + + + + + + + +
    + +
    +
    +
    + + + +
      +
    • ", $form->F_comment); + $form_com = str_replace("\n", "
      ", $form_com); + echo $form_com; + ?> +
      • +
    + + $p) { ?> +

    +
    $q) { ?> +

    + . FD_question ?> + FD_required==1){ ?> + ∗ + +

    + + + + + + FD_AnswerType)) > 0) { // 选择题 + $answer_type = intval(trim($q->FD_AnswerType))==1 ? "radio" : "checkbox"; + ?> + answer as $ka => $an) { ?> + + + + + + + +
    + + + + +
    +
    + + + + + + diff --git a/webht/views/demandform/index1.php b/webht/views/demandform/index1.php new file mode 100644 index 00000000..07c122f9 --- /dev/null +++ b/webht/views/demandform/index1.php @@ -0,0 +1,315 @@ + + + + + Easy Planning from now! + + + + + + + + + + + + + + +
    +
    +
    + +
    +

    Easy Planning from now! The only thing you need to do is telling us your preference. Leave the rest to Us!

    +
    + + + +
    + $p) { ?> +

    +

    $q) { ?> +

    FD_question ?>

    + + + + + FD_AnswerType)) === 1) { ?> +
      + answer as $ka => $an) { ?> +
    1. + +
      2. + +
    + + + +

    + +
    + +
    +
    + + + +
    + + + + diff --git a/webht/views/demandform/reply.php b/webht/views/demandform/reply.php new file mode 100644 index 00000000..f47388c5 --- /dev/null +++ b/webht/views/demandform/reply.php @@ -0,0 +1,122 @@ + + + + + + + + customer reply + + + + +
    + +

    未收到回复

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $qn) { ?> + + + + + + + +
    等级关键问题辅助信息
    + + + $qa) { + if (intval($qa[0]->FD_ismain) == 1) { + echo $qa[0]->FD_question; + foreach ($qa as $ka => $answer) { ?> +

    CRD_result) . "." . $answer->CRD_content; ?>

    + +     		+ $qa) { + if (intval($qa[0]->FD_ismain) != 1) { ?> + FD_question; ?> + $answer) { ?> +

    CRD_result) . "." . $answer->CRD_content; ?>

    + +
    + + + $qa) { + if (intval($qa[0]->FD_ismain) == 1) { + echo $qa[0]->FD_question; + foreach ($qa as $ka => $answer) { ?> +

    CRD_result) . "." . $answer->CRD_content; ?>

    + +     		+ $qa) { + if (intval($qa[0]->FD_ismain) != 1) { ?> + FD_question; ?> + $answer) { ?> +

    CRD_result) . "." . $answer->CRD_content; ?>

    + +
    + + + $qa) { + if (intval($qa[0]->FD_ismain) == 1) { ?> + FD_question; + foreach ($qa as $ka => $answer) { ?> +

    CRD_result) . "." . $answer->CRD_content; ?>

    + + +     		+ $qa) { ?> + FD_ismain) != 1) { ?> + FD_question; ?> + $answer) { ?> +

    CRD_content; ?>

    + + +
    + 其他信息 +
    + FD_question; ?> + + $na) { ?> +

    CRD_content; ?>

    + +
    + + +
    + + +