From 127fd2a57f71d7e96e441189388608434bdd1c39 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 9 Apr 2018 10:50:06 +0800 Subject: [PATCH 001/596] =?UTF-8?q?=E5=BE=B7=E8=AF=AD=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=A2=9E=E5=8A=A0=E9=A2=84=E8=A7=88=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index f551fc9f..8d4b9c00 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -346,6 +346,12 @@ var site_url = 'http://192.155.224.195:8080/guide-use.php/travelguide/guide/?static_html_url='; $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); return true; + } + //德语站点跳转测试页面 + function goto_gmtest_page() { + var site_url = 'http://gm.test/gm.php/information/detail/?static_html_url='; + $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); + return true; } function goto_test_page_pgr() { var site_url = 'http://192.155.250.125:8011/guide.php/travelguide/guide/?static_html_url='; @@ -576,6 +582,9 @@ ic_sitecode == 'cht') {?> + + ic_sitecode == 'gm') {?> + From 7b68c7aaf063f498450074c1802b25063e4ad6a6 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 9 Apr 2018 11:14:11 +0800 Subject: [PATCH 002/596] =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BE=B7=E8=AF=AD?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/information.php | 2 +- application/views/bootstrap3/information_edit.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/controllers/information.php b/application/controllers/information.php index 33912e01..c046affd 100644 --- a/application/controllers/information.php +++ b/application/controllers/information.php @@ -424,7 +424,7 @@ class Information extends CI_Controller { $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/') { + 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); diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 8d4b9c00..3b462871 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1222,7 +1222,7 @@ foreach ($author_list as $author_item) { 忽略URL重复
- config->item('site_code') == 'ah') || ($this->config->item('site_code') == 'gm')) {?> + config->item('site_code') == 'ah')) {?> - +
@@ -765,7 +765,7 @@
ic_sitecode == 'cht') { - ?> + ?>
@@ -776,15 +776,15 @@
+if ($information->ic_ht_area_type != 'c') { + echo 'hidden'; + } + ?>">
@@ -813,17 +813,17 @@
+if ($information->ic_ht_area_type == 'c') { + echo 'col-sm-4'; + } else { + echo 'col-sm-9'; + } + ?>">
$vin) { - if (in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id - ) { - $children_cnt ++; - } - } - echo ""; - if ($children_cnt > 0) { - ?> +// 有子节点时 + $children_cnt = 0; + foreach ($informationList as $kin => $vin) { + if (in_array($information->is_id, explode(",", $vin->is_path)) && $vin->status == 1 && $vin->id != $information->is_id + ) { + $children_cnt++; + } + } + echo ""; + if ($children_cnt > 0) { + ?>
- +
- +
@@ -974,9 +974,9 @@ @@ -984,7 +984,7 @@ - +
'首页', - 'tour' => '线路', - 'dest' => '目的地', - 'tailormade' => 'tailormade', - 'train' => '火车', - 'ship' => '游船', - 'hotel' => '酒店', - 'flight' => '机票', - 'info' => '信息', - 'deal' => '促销', - '2015' => '2015', - 'tour2017' => '2017', - 'op' => 'OP', - 'best' => '实用信息', - 'culture' => '文化', - 'top10' => 'TOP10', - ); - ?> +$meta_subnavi_arr = array( + 'index' => '首页', + 'tour' => '线路', + 'dest' => '目的地', + 'tailormade' => 'tailormade', + 'train' => '火车', + 'ship' => '游船', + 'hotel' => '酒店', + 'flight' => '机票', + 'info' => '信息', + 'deal' => '促销', + '2015' => '2015', + 'tour2017' => '2017', + 'op' => 'OP', + 'best' => '实用信息', + 'culture' => '文化', + 'top10' => 'TOP10', +); + ?> - ic_id, 'meta_bread_showinfo') == 'noshow') { ?> + ic_id, 'meta_bread_showinfo') == 'noshow') {?> - + - +
@@ -1068,7 +1068,7 @@
- ic_ht_area_type == 'err') { ?> + ic_ht_area_type == 'err') {?>
@@ -1090,11 +1090,11 @@
- + - + -ic_ht_area_type == 'g') { ?> +ic_ht_area_type == 'g') {?>
@@ -1135,7 +1135,7 @@
- +
@@ -1176,11 +1176,104 @@
+ + ic_sitecode == "ct" && $information->SRMS_SIC_Code == "Attraction") {?> +
+
+ + +
+ +
+ + +
+ +
+ + +
+
+ ic_sitecode == "ct") { ?> +
+
+ + +
+ +
+ + @@ -1205,13 +1298,13 @@ -ic_ht_area_type == 'pd') { ?> +ic_ht_area_type == 'pd') {?>

@@ -1220,56 +1313,56 @@
- + @@ -1283,17 +1376,17 @@ 忽略URL重复
- config->item('site_code'),array('cht','gm'))) { ?> + config->item('site_code'), array('cht', 'gm'))) {?> - + - config->item('site_code'),array('cht','ah','gm'))) { ?> + config->item('site_code'), array('cht', 'ah', 'gm'))) {?> - +
@@ -1306,20 +1399,20 @@ } ; //保存增加AMP判断 - lmr - ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') { ?> + ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') !== 'yes') {?> if (!$('#PcAmp input').is(':checked')) { var amp_confirm = window.confirm('\n检测到页面存在AMP版本，是否需要打开AMP编辑界面？\n\r注意：如果修改了PC端版本，那么同时也需要修改AMP版本。\n'); if (amp_confirm) { - window.open('', '_blank'); + window.open('', '_blank'); } } - - ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') === 'yes') { ?> + + ic_id, 'AMP_JSON') && get_meta($information->ic_id, 'AMP_STATUS') && get_meta($information->ic_id, 'AMP_BODY_PC_STATUS') === 'yes') {?> if (editor && editor.text() == '') { editor.html('From HTML-Generator'); editor.sync(); } - + if (information_check() != false) { submitForm('form_information_edit'); }">保存修改 @@ -1337,9 +1430,9 @@
  • 历史记录
    • From 9de1b5ae24babca5a69ff21c623d78a1aa079f05 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 1 Apr 2019 09:46:31 +0800 Subject: [PATCH 556/596] =?UTF-8?q?Trippest=E5=90=8C=E6=AD=A5:=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F=E4=BD=BF=E7=94=A8=E5=9C=B0=E6=8E=A5?= =?UTF-8?q?=E7=A4=BE=E6=94=B6=E6=AC=BE;=E4=BF=AE=E6=AD=A3=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=9D=A5=E6=BA=90=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trippestOrderSync/controllers/TulanduoApi.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php index 4f3e4f9e..4dd918a5 100644 --- a/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php +++ b/webht/third_party/trippestOrderSync/controllers/TulanduoApi.php @@ -3,6 +3,8 @@ if (!defined('BASEPATH')) exit('No direct script access allowed'); +define('PAY_TO_AGENCY',15020); + class TulanduoApi extends CI_Controller { public $special_route = array( @@ -439,6 +441,7 @@ class TulanduoApi extends CI_Controller $coli_update_column["COLI_Price"] = $travel_fee; $coli_update_column["COLI_CUrrency"] = $travel_fee_currency; $coli_update_column["COLI_GroupCode"] = substr(trim_str($detail_jsonResp->orderDetail->agcOrderNo), 0, 49); + $coli_update_column["COLI_sourcetype"] = empty($this->city_info[$detail_jsonResp->orderDetail->operationDep]) ? 32090 : $this->city_info[$detail_jsonResp->orderDetail->operationDep]['COLI_sourcetype']; } $this->Order_update->biz_confirmlineinfo_update($coli_update_column); /** @@ -491,7 +494,7 @@ class TulanduoApi extends CI_Controller $latest_order_detail = $this->Orders_model->get_orderinfo_detail($coli_id); /** BIZ_GroupAccountInfo */ // 团款, 只有其他社的订单, 目的地项目组的团款已经直接收入海纳账户 - $paytype = 15020; // 地接代收 + $paytype = PAY_TO_AGENCY; // 地接代收 $pay_currency = 'RMB'; $auto_text = "dataAutoEnter "; // 删除旧的录入 @@ -975,7 +978,7 @@ class TulanduoApi extends CI_Controller $this->Orders_model->BIZ_COLI_OrderDetailText = "来自图兰朵系统同步" . $list_ele["orderId"] . ";线路:" . $list_ele['routeName'] . "; 团名: " . $list_ele['agcOrderNo']; $this->Orders_model->BIZ_COLI_GUT_SN = $this->Orders_model->BIZ_GUT_SN ? $this->Orders_model->BIZ_GUT_SN : null; $this->Orders_model->BIZ_COLI_OPI_ID = 435; - $this->Orders_model->BIZ_COLI_PayManner = 15006; + $this->Orders_model->BIZ_COLI_PayManner = PAY_TO_AGENCY; return $this->Orders_model->biz_confirm_save(); } From c0f9be43ea60facb6087998289b23f1d4ebe5f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Mon, 1 Apr 2019 09:55:56 +0800 Subject: [PATCH 557/596] =?UTF-8?q?CT=E7=AB=99=E6=99=AF=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=80=89=E9=A1=B9=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index 9ecbe4b4..b5a4bce8 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1182,8 +1182,9 @@ $meta_subnavi_arr = array( - ic_sitecode == "ct" && $information->SRMS_SIC_Code == "Attraction") {?> + ic_sitecode == "ct" ) {?>
    + SRMS_SIC_Code == "Attraction") { ?>
    -
    - ic_sitecode == "ct") { ?> -
    +
    - - + From 873a312ac04c0e0f3aa546c2e0fb51f872ccee55 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 1 Apr 2019 13:48:54 +0800 Subject: [PATCH 558/596] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=AD?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2amp=E9=A1=B5=E9=9D=A2=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htmlcompressor/controllers/index_gm.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/application/third_party/htmlcompressor/controllers/index_gm.php b/application/third_party/htmlcompressor/controllers/index_gm.php index 0a987645..0ee105f1 100644 --- a/application/third_party/htmlcompressor/controllers/index_gm.php +++ b/application/third_party/htmlcompressor/controllers/index_gm.php @@ -279,16 +279,21 @@ class Index_gm extends CI_Controller //添加webp图片支持 $img_src_webp=''; if(substr($img_src, -4) == '.jpg'){ - $img_src_jpg=" width}\" height=\"{$img_size->height}\">"; + if($img_size->width < 400){ + $layout = 'fixed'; + }else{ + $layout = 'responsive'; + } + $img_src_jpg=" width}\" height=\"{$img_size->height}\">"; $img_src_webp=substr($img_src, 0, strlen($img_src) - 4).'.webp'; - $img_src_webp = " width}\" height=\"{$img_size->height}\">{$img_src_jpg}"; + $img_src_webp = " width}\" height=\"{$img_size->height}\">{$img_src_jpg}"; } if(!empty($img_src_webp)){ $image->outertext =$img_src_webp; }else{ - $image->outertext = " width}\" height=\"{$img_size->height}\">"; + $image->outertext = " width}\" height=\"{$img_size->height}\">"; } } } From b624a3f0bd7dd50a6d561f4999259ea108f657d1 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 1 Apr 2019 14:00:56 +0800 Subject: [PATCH 559/596] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=B7=E8=AF=ADAMP?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/htmlcompressor/controllers/index_gm.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/application/third_party/htmlcompressor/controllers/index_gm.php b/application/third_party/htmlcompressor/controllers/index_gm.php index 0ee105f1..33c8e074 100644 --- a/application/third_party/htmlcompressor/controllers/index_gm.php +++ b/application/third_party/htmlcompressor/controllers/index_gm.php @@ -278,11 +278,10 @@ class Index_gm extends CI_Controller if (!empty($img_size)) { //添加webp图片支持 $img_src_webp=''; + $layout = 'responsive'; if(substr($img_src, -4) == '.jpg'){ if($img_size->width < 400){ $layout = 'fixed'; - }else{ - $layout = 'responsive'; } $img_src_jpg=" width}\" height=\"{$img_size->height}\">"; From 63f6659242ab7f5eb2d8392f6b4387d7e655660b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=B9=8F?= Date: Tue, 2 Apr 2019 16:36:54 +0800 Subject: [PATCH 560/596] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=A2=9E=E5=8A=A011?= =?UTF-8?q?=E4=B8=BA=E6=9C=80=E9=AB=98=E7=BA=A7=E7=9A=84=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E5=A4=A7=E5=9B=BE=E7=94=A8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index b5a4bce8..a2bf64f4 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -1267,6 +1267,7 @@ $meta_subnavi_arr = array( + From 06d74423ff88cde54a7ac63faa69b6a2f8051b39 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Wed, 10 Apr 2019 13:49:18 +0800 Subject: [PATCH 561/596] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E4=BA=BA?= =?UTF-8?q?=E5=A1=AB=E6=8A=A4=E7=85=A7=E4=BF=A1=E6=81=AF=E7=9A=84=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/order/views/confirm_order.php | 2 +- application/third_party/order/views/mailtext.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/application/third_party/order/views/confirm_order.php b/application/third_party/order/views/confirm_order.php index a916af4c..05a815f3 100644 --- a/application/third_party/order/views/confirm_order.php +++ b/application/third_party/order/views/confirm_order.php @@ -731,7 +731,7 @@ }); - $("#btn-add-personinfo-box").click(); + // $("#btn-add-personinfo-box").click(); //日期初始化 diff --git a/application/third_party/order/views/mailtext.php b/application/third_party/order/views/mailtext.php index fc6b27eb..2a1a8114 100644 --- a/application/third_party/order/views/mailtext.php +++ b/application/third_party/order/views/mailtext.php @@ -25,7 +25,6 @@

    Contact Information

    Land line:

    Mobile:

    -

    Home Address:

    Flight Information From ad9e5581caa8e71864561f90f0641c354410da10 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Fri, 12 Apr 2019 11:10:42 +0800 Subject: [PATCH 562/596] rm --- application/controllers/gaapi.php | 69 +++++++++---------- .../sylvan-box-234910-357cb59e6bf0.json | 12 ---- 2 files changed, 34 insertions(+), 47 deletions(-) delete mode 100644 application/controllers/gaapi_json/sylvan-box-234910-357cb59e6bf0.json diff --git a/application/controllers/gaapi.php b/application/controllers/gaapi.php index 33003782..2027f22f 100644 --- a/application/controllers/gaapi.php +++ b/application/controllers/gaapi.php @@ -16,7 +16,7 @@ class Gaapi extends CI_Controller public function user_track() { - $cid = $this->input->get_post('cid'); + $cid = $this->input->get_post('cid'); $analytics = $this->initializeAnalytics(); $response = $this->getReport($analytics, $cid); $this->printResults($response); @@ -24,17 +24,17 @@ class Gaapi extends CI_Controller /** - * Initializes an Analytics Reporting API V4 service object. - * - * @return An authorized Analytics Reporting API V4 service object. - */ + * Initializes an Analytics Reporting API V4 service object. + * + * @return An authorized Analytics Reporting API V4 service object. + */ function initializeAnalytics() { // Use the developers console and download your service account // credentials in JSON format. Place them in this directory or // change the key file location if necessary. - $KEY_FILE_LOCATION = __DIR__ . '/gaapi_json/sylvan-box-234910-357cb59e6bf0.json'; + $KEY_FILE_LOCATION = 'c:/gaapi_json/sylvan-box-234910-357cb59e6bf0.json'; // Create and configure a new client object. $client = new Google_Client(); @@ -48,14 +48,14 @@ class Gaapi extends CI_Controller /** - * Queries the Analytics Reporting API V4. - * - * @param service An authorized Analytics Reporting API V4 service object. - * @return The Analytics Reporting API V4 response. - */ + * Queries the Analytics Reporting API V4. + * + * @param service An authorized Analytics Reporting API V4 service object. + * @return The Analytics Reporting API V4 response. + */ function getReport($analytics, $cid_no) { - //die($cid); + //die($cid); // Replace with your view ID, for example XXXX. $VIEW_ID = "68484932"; @@ -77,24 +77,24 @@ class Gaapi extends CI_Controller $cid->setName("ga:dimension1"); $hitTime = new Google_Service_AnalyticsReporting_Dimension(); $hitTime->setName("ga:dimension3"); - $ip = new Google_Service_AnalyticsReporting_Dimension(); + $ip = new Google_Service_AnalyticsReporting_Dimension(); $ip->setName("ga:dimension3"); - // Create Dimension Filter 1 + // Create Dimension Filter 1 $cidFilter = new Google_Service_AnalyticsReporting_DimensionFilter(); $cidFilter->setDimensionName("ga:dimension1"); $cidFilter->setOperator('EXACT'); $cidFilter->setExpressions($cid_no); - - // Create the DimensionFilterClauses + + // Create the DimensionFilterClauses $dimensionFilterClause = new Google_Service_AnalyticsReporting_DimensionFilterClause(); $dimensionFilterClause->setFilters(array($cidFilter)); - // OrderBy maybe some bugs - $order = new Google_Service_AnalyticsReporting_OrderBy; - $order->setFieldName("ga:dimension3"); - $order->setOrderType("VALUE"); - $order->setSortOrder("DESCENDING"); + // OrderBy maybe some bugs + $order = new Google_Service_AnalyticsReporting_OrderBy; + $order->setFieldName("ga:dimension3"); + $order->setOrderType("VALUE"); + $order->setSortOrder("DESCENDING"); // Create the ReportRequest object. $request = new Google_Service_AnalyticsReporting_ReportRequest(); @@ -102,8 +102,8 @@ class Gaapi extends CI_Controller $request->setDateRanges($dateRange); $request->setMetrics(array($pv)); $request->setDimensions(array($pageUrl, $cid, $hitTime)); - $request->setDimensionFilterClauses(array($dimensionFilterClause)); - $request->setOrderBys(array($order)); + $request->setDimensionFilterClauses(array($dimensionFilterClause)); + $request->setOrderBys(array($order)); $body = new Google_Service_AnalyticsReporting_GetReportsRequest(); $body->setReportRequests(array($request)); @@ -118,26 +118,26 @@ class Gaapi extends CI_Controller */ function printResults($reports) { - $alais_array = array( - "ga:dimension1" => "cid", - "ga:dimension3" => "hitTime", - "ga:pagePath" => "path" - ); - $rs_array = array(); + $alais_array = array( + "ga:dimension1" => "cid", + "ga:dimension3" => "hitTime", + "ga:pagePath" => "path" + ); + $rs_array = array(); for ($reportIndex = 0; $reportIndex < count($reports); $reportIndex++) { $report = $reports[$reportIndex]; $header = $report->getColumnHeader(); $dimensionHeaders = $header->getDimensions(); $metricHeaders = $header->getMetricHeader()->getMetricHeaderEntries(); $rows = $report->getData()->getRows(); - $rs_row = array(); + $rs_row = array(); for ($rowIndex = 0; $rowIndex < count($rows); $rowIndex++) { $row = $rows[$rowIndex]; $dimensions = $row->getDimensions(); $metrics = $row->getMetrics(); for ($i = 0; $i < count($dimensionHeaders) && $i < count($dimensions); $i++) { //print($dimensionHeaders[$i] . ": " . $dimensions[$i] . "\n"); - $rs_row[$alais_array[$dimensionHeaders[$i]]] = $dimensions[$i]; + $rs_row[$alais_array[$dimensionHeaders[$i]]] = $dimensions[$i]; } for ($j = 0; $j < count($metrics); $j++) { @@ -145,14 +145,13 @@ class Gaapi extends CI_Controller for ($k = 0; $k < count($values); $k++) { $entry = $metricHeaders[$k]; //print($entry->getName() . ": " . $values[$k] . "\n"); - $rs_row[$entry->getName()] = $values[$k]; + $rs_row[$entry->getName()] = $values[$k]; } } - array_push($rs_array, $rs_row); + array_push($rs_array, $rs_row); } } - echo(json_encode($rs_array)); + echo (json_encode($rs_array)); } - } //end of gaapi diff --git a/application/controllers/gaapi_json/sylvan-box-234910-357cb59e6bf0.json b/application/controllers/gaapi_json/sylvan-box-234910-357cb59e6bf0.json deleted file mode 100644 index 1cd817fc..00000000 --- a/application/controllers/gaapi_json/sylvan-box-234910-357cb59e6bf0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "type": "service_account", - "project_id": "sylvan-box-234910", - "private_key_id": "357cb59e6bf066231fe9d421a1cada76b6af29ef", - "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDSNl/aj3hQf6bf\naPBHuGTLemiUl2OborE8MNvl5brhJMncTSslS1Q5CQRPk4K6nW1gAq2/gQ5KZ7Sd\nh9gdtWzIDoUS1DBDaZiPB8vVN6YOjIWpRSylIXTewQ6YYuw9kt7vW0orfDSsaWrE\nc2Yb5YN+6GTxVBjFEb19IYg5/8zfmvaUCOinDwO+F8mh6fCS9FyhiN5omKD+ixiQ\nYFIo1CM1SCpT3eH67JIF+hzuGAVWhF7YmdNTBdfrM0/1PBM8HRry0jD1VaDeyv+e\n4lTnPCtvUgc5SJOaLv/UR06X1FpIYikK0RHJ04fTslQxu7hTLqbhg/7d/+aj95K0\nAwaGERvdAgMBAAECggEAAOQZHFdoDVxwlSJEqeNyIDZh+GIfmnYQAUFhMKkOsPCc\nw9rtTxrNRxace0fd2sXtVkF8pp5dWTasmmIMPGNt+dLR7pP/z4Of2o9ZQcJR1vCp\nZc195rz/EL+AmGgLgZXg/5lxGhyDKhJ9vpORNt/FPiFALyOueJ/wslEnkZfwDANv\n0C+uIv2L3g0mrgTqXVwU/dVdYi9UK7hhn0YMgtlbdpxRHV0cIiilb23Cyy0QsFXN\n2MsoHPQWf+72nE+5jNnysXcR8AjAthzOvP/jIcqqBguid1w9F3goH4adLTa1aPIL\ndNGI/z9mwuqGQg5C78ZfmZMb3YIRwV4nmUia7kzrowKBgQDr2h14VyEGAypCjo+r\nXRvDti55PY+jKUnUzbseJca7Z1Z2snvGXWgkoasZc8ozsQjoH7wJJnRoJOGnAJdF\ntyZxtJV5W0pefB6Pfqy6k5MlJJhMy6lGpkQo96iPOBqfowHa1r/S55USHjQAMXG2\nKrX6oq1IWmEmFYMFZnQo7+SPqwKBgQDkK4rnCbirwHC0Z6eXkbk0Fb8KrS0huq3C\nupaoBtwkfkyISBzcXx6Bup/Gg7czSxvY6U/Bg93WtTzzJwVuqKSqcTUrwW4rAmrh\nZNEYjJc5YLKK1xXVOEeisMIsWCEpF8JHvyrCRsoBCOVRbQROFqz9IOSGrplw1Rq6\ntuPp2fsalwKBgQDgbfabG/X9vadKHFSUUY5pBwRkNHNpZJGwIXEMeBALJoN9gcwM\nb7f5G6owFyHzXGRIVmJdJq2gqG/dtc889NJtYtTV3UwAawW9sGH3TRS5RIB0m1xi\nMTcs8LYCSvXysG/EaZOxwtL0oa8D/AjjuvLeJEzWS8KkNdYunlas2dJZ7wKBgEAO\nlWV9jjHxyfJr81oTGDquLD80FSqV/ThhJ/CuVFmOd6//BtM7hRYIrdiOm/0zhfLk\ntXZvrfUcVqsw9k513BzZwYKyQFqkyBrVMfrBZac/JYDjF4cP0NS06R6H829U8z8v\nRTLbqtSVicPNZlsB9Ljv5hiFpiBOQ73NoLjDcMKrAoGAC+mrH9aOBeQuikQllpWJ\naZ7XoDdZcmh3j+o7OZWHAP3mpQ6q6/1iPW4lhG/q6l+syjsYRmQuzYICtSJ6xQlC\nM+AYPjD+O6sW3MWGz469cqrym8o+Bm24emxJNvilo/U/N2Yif2gUGWgw8qXLEGsu\nUedwiH6aWGBFnlVuPz6CZ6s=\n-----END PRIVATE KEY-----\n", - "client_email": "gaapi-904@sylvan-box-234910.iam.gserviceaccount.com", - "client_id": "112785767675412711830", - "auth_uri": "https://accounts.google.com/o/oauth2/auth", - "token_uri": "https://oauth2.googleapis.com/token", - "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs", - "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/gaapi-904%40sylvan-box-234910.iam.gserviceaccount.com" -} From 3badd8277244c9724d38729ac664ce5eccd4522d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= Date: Fri, 12 Apr 2019 11:17:07 +0800 Subject: [PATCH 563/596] =?UTF-8?q?CT=E7=9A=84AMP=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htmlcompressor/views/amp-template/ct.php | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/application/third_party/htmlcompressor/views/amp-template/ct.php b/application/third_party/htmlcompressor/views/amp-template/ct.php index c5048912..338379ef 100644 --- a/application/third_party/htmlcompressor/views/amp-template/ct.php +++ b/application/third_party/htmlcompressor/views/amp-template/ct.php @@ -49,23 +49,6 @@ footer p { margin-bottom:0.5rem;} #crumbNav a:hover { color: #a31022; text-decoration: none } /* from font awesome */ @font-face{font-family:FontAwesome;src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?v=4.7.0);src:url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0) format('embedded-opentype'),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff2?v=4.7.0) format('woff2'),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.woff?v=4.7.0) format('woff'),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.ttf?v=4.7.0) format('truetype'),url(https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular) format('svg');font-weight:400;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-facebook-square:before{content:"\f082"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-tripadvisor:before{content:"\f262"}.fa-500px:before{content:"\f26e"}.fa-angle-down:before{content:"\f107"}.fa-square-o:before{content:"\f096"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"} -.fa-facebook-square:before { content: "\f082" } -.fa-facebook-f:before, .fa-facebook:before { content: "\f09a" } -.fa-twitter:before { content: "\f099" } -.fa-pinterest:before { content: "\f0d2" } -.fa-pinterest-square:before { content: "\f0d3" } -.fa-caret-down:before { content: "\f0d7" } -.fa-caret-up:before { content: "\f0d8" } -.fa-caret-left:before { content: "\f0d9" } -.fa-caret-right:before { content: "\f0da" } -.fa-instagram:before { content: "\f16d" } -.fa-flickr:before { content: "\f16e" } -.fa-tripadvisor:before { content: "\f262" } -.fa-500px:before { content: "\f26e" } -.fa-angle-down:before { content: "\f107" } -.fa-square-o:before { content: "\f096" } -.fa-angle-left:before { content: "\f104" } -.fa-angle-right:before { content: "\f105" } .fa-navicon:before,.fa-reorder:before,.fa-bars:before { content: "\f0c9"; color:#333; margin:0.32rem 0 0 1rem; } .fa-google-plus::before { content: "\f0d5";} /* sidebar style */ @@ -134,9 +117,9 @@ html{font-size:16px}

    China Tours

    From 4ea5eb7147f1732f2a3fc2f28a01e3586a252b68 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 15 Apr 2019 10:51:32 +0800 Subject: [PATCH 564/596] =?UTF-8?q?alipay=20=E5=A2=9E=E5=8A=A0=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E5=8F=B7=E6=9F=A5=E8=AF=A2=E6=B2=A1=E6=9C=89=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E9=80=9A=E7=9F=A5=E7=9A=84=E6=94=B6=E6=AC=BE(?= =?UTF-8?q?=E6=9D=A5=E8=87=AA=E6=94=B6=E9=92=B1=E7=A0=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/AlipayTradeService.php | 44 ++++++++++++++----- .../pay/models/Alipay_note_model.php | 3 +- webht/third_party/pay/views/alipay_list.php | 9 +++- 3 files changed, 42 insertions(+), 14 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 808c6b0c..2c414461 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -509,29 +509,24 @@ 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; } /*! @@ -624,6 +619,30 @@ 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" && strval($query_pay->trade_status)==="TRADE_SUCCESS") { + $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 + ,NULL + ,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']); } @@ -743,6 +762,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/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/views/alipay_list.php b/webht/third_party/pay/views/alipay_list.php index d3a9c1ad..afe0d5c2 100644 --- a/webht/third_party/pay/views/alipay_list.php +++ b/webht/third_party/pay/views/alipay_list.php @@ -66,6 +66,7 @@ /*.input-group{border: 1px solid #ccc;}*/ .input-group-btn{border: 1px solid #ccc;padding: 5px;} .search-btn{cursor: pointer; background: url(//data.chinahighlights.com/css/images/global/site-search-button.png) no-repeat center center;} + .center-block{display: block;margin: 0 auto;} @@ -75,6 +76,7 @@

    Alipay Notes

    +
    • @@ -164,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; @@ -206,6 +209,9 @@ + @@ -224,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) { From 6384c575806c9b8027b189e7a90d4b805c5880f5 Mon Sep 17 00:00:00 2001 From: LMR <59361885@qq.com> Date: Tue, 16 Apr 2019 13:58:53 +0800 Subject: [PATCH 565/596] =?UTF-8?q?google=20ga=E8=AE=A4=E8=AF=81=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/controllers/gaapi.php | 157 ------------------------------ 1 file changed, 157 deletions(-) delete mode 100644 application/controllers/gaapi.php diff --git a/application/controllers/gaapi.php b/application/controllers/gaapi.php deleted file mode 100644 index 2027f22f..00000000 --- a/application/controllers/gaapi.php +++ /dev/null @@ -1,157 +0,0 @@ -permission->is_admin(); - $this->site_code = $this->config->item('site_code'); - //ga verder - $this->load->library('MY_Composer'); - } - - public function user_track() - { - $cid = $this->input->get_post('cid'); - $analytics = $this->initializeAnalytics(); - $response = $this->getReport($analytics, $cid); - $this->printResults($response); - } - - - /** - * Initializes an Analytics Reporting API V4 service object. - * - * @return An authorized Analytics Reporting API V4 service object. - */ - function initializeAnalytics() - { - - // Use the developers console and download your service account - // credentials in JSON format. Place them in this directory or - // change the key file location if necessary. - $KEY_FILE_LOCATION = 'c:/gaapi_json/sylvan-box-234910-357cb59e6bf0.json'; - - // Create and configure a new client object. - $client = new Google_Client(); - $client->setApplicationName("User Tracker"); - $client->setAuthConfig($KEY_FILE_LOCATION); - $client->setScopes(['https://www.googleapis.com/auth/analytics.readonly']); - $analytics = new Google_Service_AnalyticsReporting($client); - - return $analytics; - } - - - /** - * Queries the Analytics Reporting API V4. - * - * @param service An authorized Analytics Reporting API V4 service object. - * @return The Analytics Reporting API V4 response. - */ - function getReport($analytics, $cid_no) - { - //die($cid); - - // Replace with your view ID, for example XXXX. - $VIEW_ID = "68484932"; - - // Create the DateRange object. - $dateRange = new Google_Service_AnalyticsReporting_DateRange(); - $dateRange->setStartDate("30daysAgo"); - $dateRange->setEndDate("today"); - - // Create the Metrics object. - $pv = new Google_Service_AnalyticsReporting_Metric(); - $pv->setExpression("ga:pageviews"); - $pv->setAlias("pageviews"); - - //Create the dimensions - $pageUrl = new Google_Service_AnalyticsReporting_Dimension(); - $pageUrl->setName("ga:pagePath"); - $cid = new Google_Service_AnalyticsReporting_Dimension(); - $cid->setName("ga:dimension1"); - $hitTime = new Google_Service_AnalyticsReporting_Dimension(); - $hitTime->setName("ga:dimension3"); - $ip = new Google_Service_AnalyticsReporting_Dimension(); - $ip->setName("ga:dimension3"); - - // Create Dimension Filter 1 - $cidFilter = new Google_Service_AnalyticsReporting_DimensionFilter(); - $cidFilter->setDimensionName("ga:dimension1"); - $cidFilter->setOperator('EXACT'); - $cidFilter->setExpressions($cid_no); - - // Create the DimensionFilterClauses - $dimensionFilterClause = new Google_Service_AnalyticsReporting_DimensionFilterClause(); - $dimensionFilterClause->setFilters(array($cidFilter)); - - // OrderBy maybe some bugs - $order = new Google_Service_AnalyticsReporting_OrderBy; - $order->setFieldName("ga:dimension3"); - $order->setOrderType("VALUE"); - $order->setSortOrder("DESCENDING"); - - // Create the ReportRequest object. - $request = new Google_Service_AnalyticsReporting_ReportRequest(); - $request->setViewId($VIEW_ID); - $request->setDateRanges($dateRange); - $request->setMetrics(array($pv)); - $request->setDimensions(array($pageUrl, $cid, $hitTime)); - $request->setDimensionFilterClauses(array($dimensionFilterClause)); - $request->setOrderBys(array($order)); - - $body = new Google_Service_AnalyticsReporting_GetReportsRequest(); - $body->setReportRequests(array($request)); - return $analytics->reports->batchGet($body); - } - - - /** - * Parses and prints the Analytics Reporting API V4 response. - * - * @param An Analytics Reporting API V4 response. - */ - function printResults($reports) - { - $alais_array = array( - "ga:dimension1" => "cid", - "ga:dimension3" => "hitTime", - "ga:pagePath" => "path" - ); - $rs_array = array(); - for ($reportIndex = 0; $reportIndex < count($reports); $reportIndex++) { - $report = $reports[$reportIndex]; - $header = $report->getColumnHeader(); - $dimensionHeaders = $header->getDimensions(); - $metricHeaders = $header->getMetricHeader()->getMetricHeaderEntries(); - $rows = $report->getData()->getRows(); - $rs_row = array(); - for ($rowIndex = 0; $rowIndex < count($rows); $rowIndex++) { - $row = $rows[$rowIndex]; - $dimensions = $row->getDimensions(); - $metrics = $row->getMetrics(); - for ($i = 0; $i < count($dimensionHeaders) && $i < count($dimensions); $i++) { - //print($dimensionHeaders[$i] . ": " . $dimensions[$i] . "\n"); - $rs_row[$alais_array[$dimensionHeaders[$i]]] = $dimensions[$i]; - } - - for ($j = 0; $j < count($metrics); $j++) { - $values = $metrics[$j]->getValues(); - for ($k = 0; $k < count($values); $k++) { - $entry = $metricHeaders[$k]; - //print($entry->getName() . ": " . $values[$k] . "\n"); - $rs_row[$entry->getName()] = $values[$k]; - } - } - array_push($rs_array, $rs_row); - } - } - echo (json_encode($rs_array)); - } -} -//end of gaapi From 43e9c8a68ef015b1ae5de0f9397a9d3880a7027e Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 17 Apr 2019 15:12:46 +0800 Subject: [PATCH 566/596] =?UTF-8?q?wxpay=20=E5=BC=82=E6=AD=A5=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A4=84=E7=90=86:=E6=8E=A5=E6=94=B6=E6=8E=A8?= =?UTF-8?q?=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/config/wxpay.php | 25 +++ .../pay/controllers/WxpayService.php | 160 ++++++++++++++++++ .../pay/helpers/payment_helper.php | 40 +++++ .../models/Online_payment_account_model.php | 27 +++ .../pay/models/Online_payment_note_model.php | 31 ++++ webht/third_party/pay/views/alipay_list.php | 2 +- 6 files changed, 284 insertions(+), 1 deletion(-) create mode 100644 webht/third_party/pay/config/wxpay.php create mode 100644 webht/third_party/pay/controllers/WxpayService.php create mode 100644 webht/third_party/pay/models/Online_payment_account_model.php create mode 100644 webht/third_party/pay/models/Online_payment_note_model.php diff --git a/webht/third_party/pay/config/wxpay.php b/webht/third_party/pay/config/wxpay.php new file mode 100644 index 00000000..b4752bff --- /dev/null +++ b/webht/third_party/pay/config/wxpay.php @@ -0,0 +1,25 @@ +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') + { +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'); + if (!isset($GLOBALS['HTTP_RAW_POST_DATA'])) { + # 如果没有数据，直接返回失败 + return $this->response_to_wx($response); + } + //获取通知的数据 + $xml = $GLOBALS['HTTP_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 send_notify() + { + // $save_column['OPN_accountType'] = $xml_arr['']; + // $save_column['OPN_accountStatus'] = $xml_arr['']; + // $save_column['OPN_accountTime'] = $xml_arr['']; + } + + 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.'); + 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/helpers/payment_helper.php b/webht/third_party/pay/helpers/payment_helper.php index 3ec1e8cc..53ceac5e 100644 --- a/webht/third_party/pay/helpers/payment_helper.php +++ b/webht/third_party/pay/helpers/payment_helper.php @@ -180,3 +180,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/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php new file mode 100644 index 00000000..3c19ea87 --- /dev/null +++ b/webht/third_party/pay/models/Online_payment_account_model.php @@ -0,0 +1,27 @@ +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; + } + +} + 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..2c721c52 --- /dev/null +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -0,0 +1,31 @@ +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; + } + + + +} + diff --git a/webht/third_party/pay/views/alipay_list.php b/webht/third_party/pay/views/alipay_list.php index afe0d5c2..faceb099 100644 --- a/webht/third_party/pay/views/alipay_list.php +++ b/webht/third_party/pay/views/alipay_list.php @@ -95,7 +95,7 @@
      - +
      From 4decfcfae7768118860b4d4b6f466fde651a8236 Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 17 Apr 2019 17:37:03 +0800 Subject: [PATCH 567/596] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=94=B6=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E6=94=B6=E6=AC=BE=E6=8E=A8=E9=80=81,=E5=B0=86?= =?UTF-8?q?=E5=90=84=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E7=9A=84=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=96=B9=E6=B3=95=E5=90=88=E5=B9=B6.=2020%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/PaymentService.php | 43 +++++++++++++++ .../pay/controllers/WxpayService.php | 9 +--- .../pay/models/Online_payment_note_model.php | 53 +++++++++++++++++++ 3 files changed, 97 insertions(+), 8 deletions(-) create mode 100644 webht/third_party/pay/controllers/PaymentService.php diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php new file mode 100644 index 00000000..72dbf507 --- /dev/null +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -0,0 +1,43 @@ +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 send_notify($payment_method=NULL, $transactionId=NULL) + { + // $save_column['OPN_accountType'] = $xml_arr['']; + // $save_column['OPN_accountStatus'] = $xml_arr['']; + // $save_column['OPN_accountTime'] = $xml_arr['']; + $data = array(); + $int = 0; + + //优先处理指定的交易号，用于修正交易号直接发送通知 + if ( ! empty($transactionId)) { + $data['unsend_list'] = $this->note_model->get_note($payment_method, $transactionId); + } + // 待处理的 + if (empty($data['unsend_list'])) { + $data['unsend_list'] = $this->note_model->unsend_note($payment_method, 10); + } + //没有未处理的数据再查找处理失败的数据 + if (empty($data['unsend_list'])) { + $data['unsend_list'] = $this->note_model->sendfail_note($payment_method, 20); + } + } + +} + diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php index d6f7ce6b..2ee2daa0 100644 --- a/webht/third_party/pay/controllers/WxpayService.php +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -90,13 +90,6 @@ log_message('error','notify begin ----'); # exit(); // end } - public function send_notify() - { - // $save_column['OPN_accountType'] = $xml_arr['']; - // $save_column['OPN_accountStatus'] = $xml_arr['']; - // $save_column['OPN_accountTime'] = $xml_arr['']; - } - public function check_sign($xml_arr) { if ( ! array_key_exists('sign', $xml_arr)) { @@ -135,7 +128,7 @@ log_message('error','notify begin ----'); } //签名步骤四：所有字符转为大写 $result = strtoupper($string); -log_message('error',$result); +// log_message('error',$result); return $result; } diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index 2c721c52..86f4a9cc 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -25,6 +25,59 @@ class Online_payment_note_model extends CI_Model { return TRUE; } + public $topnum = false; + public $orderby = false; + public $send = false; + public $search = false; + public $transactionId = false; + public $payment_status = false; + public function init_query() { + $this->topnum = false; + $this->send = false; + $this->search = false; + $this->payment_status = false; + $this->transactionId = false; + $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->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($payment_method=NULL, $transactionId=null) + { + $this->init_query(); + $this->topnum=1; + $this->transactionId = " AND opn.OPN_transactionId=" . $this->INFO->escape($transactionId); + return $this->query_note(); + } + + public function unsend_note($payment_method=NULL, $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($payment_method=NULL, $num=2) + { + $this->init_query(); + $this->topnum = $num; + $this->send = " AND OPN_noticeSendStatus='sendfail' "; + return $this->query_note(); + } + } From df00c0823daf3b81e7c0790ed3040fa960bded15 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 18 Apr 2019 11:54:40 +0800 Subject: [PATCH 568/596] =?UTF-8?q?=E5=BC=82=E6=AD=A5=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E5=8F=AA=E8=83=BD=E8=BE=93=E5=87=BA=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E5=AD=97=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/WxpayService.php | 1 + 1 file changed, 1 insertion(+) diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php index 2ee2daa0..e073dbd1 100644 --- a/webht/third_party/pay/controllers/WxpayService.php +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -23,6 +23,7 @@ class WxpayService extends CI_Controller { public function notify($site='cht') { + error_reporting(0); log_message('error','notify begin ----'); $response['return_code'] = 'FAIL'; $response['return_msg'] = ''; From 34d402bf8371802745c272164f9f62db6d173531 Mon Sep 17 00:00:00 2001 From: LiaoYijun Date: Fri, 19 Apr 2019 11:40:57 +0800 Subject: [PATCH 569/596] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20LYJ=20=E4=B8=BA?= =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/config/config.php b/application/config/config.php index 82fb443e..684dda6a 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -660,7 +660,7 @@ $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'] = ''; From d1b78f0c62a61add390bcfe0484dfb3e37eb7b2b Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 13:23:30 +0800 Subject: [PATCH 570/596] =?UTF-8?q?Trippest=E7=AB=99=E7=82=B9=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E8=87=AA=E5=8A=A8=E5=BD=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 128 +++++++++++++++++- .../paypal/models/paypal_model.php | 9 +- 2 files changed, 134 insertions(+), 3 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 545a94be..2dacf8a9 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -755,6 +755,7 @@ class Index extends CI_Controller { } //检测是否是APP订单,默认不处理 + // && $item->pn_payment_status !== 'Refunded' if ( ( (strpos($item->pn_memo, 'China Train Booking') !== false) || (strpos($item->pn_memo, 'ChinaTrainBooking') !== false) @@ -879,12 +880,135 @@ class Index extends CI_Controller { //echo 'done!'; } + public function send_refund($item) + { + // 找到原始收款交易的订单 + $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); + $handpick = empty($pn_txn_id) ? false : TRUE; + $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 { + // 把订单状态设置为13-新订单已支付 + 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); + // 添加HT任务 // todo 是否还需要 + $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'); + 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'); + //添加邮件发送记录 end + + return $this->Note_model->update_send($item->pn_txn_id, 'send'); + } + public function trippest_note($orderid_info, $paypal_msg) { + $tp_orderid = "#" . substr($orderid_info->orderid, 10); + // 获取HT订单号 + $ht_tp_order = $this->Paypal_model->get_trippest_order($tp_orderid); + if (empty($ht_tp_order)) { + return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail'); + } + //更新正确的订单信息到记录中，以这个为主 + $this->Note_model->set_invoice($item->pn_txn_id, $ht_tp_order->COLI_ID . '_B'); + $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); + $ht_memo = '交易号(自动录入):' . $item->pn_txn_id; + $this->Paypal_model->add_account_info( + $ht_tp_order->COLI_SN, + $ht_tp_order->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 + ); + $opi_firstname = "David"; $opi_email = "david@trippest.com"; - $orderid_info->orderid = $orderid_info->orderid . "#" . substr($orderid_info->orderid, 10); - + $orderid_info->orderid = $orderid_info->orderid . "#" . $tp_orderid; $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 : ''; diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php index 5ee4b9ad..c32c7a05 100644 --- a/webht/third_party/paypal/models/paypal_model.php +++ b/webht/third_party/paypal/models/paypal_model.php @@ -212,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; @@ -602,4 +602,11 @@ class Paypal_model extends CI_Model { ); return $this->HT->insert("BIZ_OrderOperationLog", $db_column); } + + public function get_trippest_order($tp_order) + { + $sql = "SELECT top 1 * from BIZ_ConfirmLineInfo + WHERE COLI_PriceMemo=? "; + return $this->HT->query($sql, array($tp_order))->row(); + } } From c25105bba8251977c3fc95d11a47863e3826f9d1 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 16:52:32 +0800 Subject: [PATCH 571/596] =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=A4=84=E7=90=8630%?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/controllers/index.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 2dacf8a9..e6ba1bd4 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -714,6 +714,7 @@ class Index extends CI_Controller { //找到没有发送的记录 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)) { @@ -880,7 +881,7 @@ class Index extends CI_Controller { //echo 'done!'; } - public function send_refund($item) + public function send_refund($item, $handpick, $old_ssje=NULL) { // 找到原始收款交易的订单 $parent_note = $this->note_modal->note($item->parent_txn_id); @@ -904,7 +905,6 @@ class Index extends CI_Controller { //根据订单号查找外联信息 $orderid_info = json_decode($orderid_info); - $handpick = empty($pn_txn_id) ? false : TRUE; $advisor_info = $this->Paypal_model->get_order($orderid_info->orderid, false, $orderid_info->ordertype, $handpick); //查不到订单信息 @@ -931,7 +931,6 @@ class Index extends CI_Controller { $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 { - // 把订单状态设置为13-新订单已支付 if (false == $this->Paypal_model->if_biz_gai_exists($item->pn_txn_id) ) { $this->Paypal_model->insert_biz_order_log($GAI_COLI_SN, 'Refunded'); } @@ -946,8 +945,6 @@ class Index extends CI_Controller { $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任务 // todo 是否还需要 - $this->Paypal_model->exec_addToTask($gai_sn); } } @@ -973,8 +970,10 @@ class Index extends CI_Controller { $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'); } From 6ce3c4b338838f1f429f1e5b56a065c51dd5b0df Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 16:55:23 +0800 Subject: [PATCH 572/596] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 2c414461..d9f4cf39 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -621,7 +621,9 @@ var_dump($response->$responseNode); $data['notelist'] = $this->Alipay_note_model->search_key($data['keywords']); /** 手动查询通过收钱码的收款, 必须输入交易号 */ if (empty($data['notelist'])) { + log_message('error','Alipay query ' . $data["keywords"]); $query_pay = $this->query_pay($data["keywords"]); + log_message('error','Alipay query result ' . var_export($query_pay, 1)); if ( ! empty($query_pay) && strval($query_pay->code)==="10000" && strval($query_pay->trade_status)==="TRADE_SUCCESS") { $pay_type = $query_pay->total_amount>0 ? "pay" : "refund"; $new_record = $this->Alipay_note_model->save_alipay( From fafa1ad0177e8ecfe59243cc7874a374988f0134 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 17:05:34 +0800 Subject: [PATCH 573/596] =?UTF-8?q?Alipay=20=E7=8A=B6=E6=80=81:=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index d9f4cf39..277c4e4f 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -113,7 +113,8 @@ class AlipayTradeService extends CI_Controller } $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(trim(strval($asyns_resp->data->trade_status)), "TRADE_SUCCESS") == 0) { + 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) @@ -624,7 +625,8 @@ var_dump($response->$responseNode); log_message('error','Alipay query ' . $data["keywords"]); $query_pay = $this->query_pay($data["keywords"]); log_message('error','Alipay query result ' . var_export($query_pay, 1)); - if ( ! empty($query_pay) && strval($query_pay->code)==="10000" && strval($query_pay->trade_status)==="TRADE_SUCCESS") { + 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) From 0f955f66b6a2f609411227e4c9af5e995aec7a79 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 17:30:41 +0800 Subject: [PATCH 574/596] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 277c4e4f..a03e682d 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -622,9 +622,7 @@ var_dump($response->$responseNode); $data['notelist'] = $this->Alipay_note_model->search_key($data['keywords']); /** 手动查询通过收钱码的收款, 必须输入交易号 */ if (empty($data['notelist'])) { - log_message('error','Alipay query ' . $data["keywords"]); $query_pay = $this->query_pay($data["keywords"]); - log_message('error','Alipay query result ' . var_export($query_pay, 1)); 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"; From 8ca66f997f8134f9e5e38549ae009d7d9463480a Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 19 Apr 2019 17:52:02 +0800 Subject: [PATCH 575/596] =?UTF-8?q?Alipay=20=E7=8A=B6=E6=80=81:=E4=BA=A4?= =?UTF-8?q?=E6=98=93=E7=BB=93=E6=9D=9F=20=E8=87=AA=E5=8A=A8=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index a03e682d..709e64bf 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -359,7 +359,8 @@ class AlipayTradeService extends CI_Controller } //只处理完成状态，其他状态由陆燕处理 - if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS")) { + if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS") + || strcmp(trim($item->ALI_resultMsg), "TRADE_FINISHED")) { $this->Alipay_note_model->update_send($item->ALI_dealId, 'send'); continue; } From 51a7f9ef470875ca7d3344ac1689fb66dfb99b23 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Apr 2019 10:04:54 +0800 Subject: [PATCH 576/596] =?UTF-8?q?wxpay=20=E4=BF=AE=E6=94=B9=E8=AF=BB?= =?UTF-8?q?=E5=8F=96post=E6=95=B0=E6=8D=AE=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/WxpayService.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php index e073dbd1..5f7f8e74 100644 --- a/webht/third_party/pay/controllers/WxpayService.php +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -29,12 +29,14 @@ log_message('error','notify begin ----'); $response['return_msg'] = ''; $GLOBALS['__WX_SITE_NAME__'] = $site; $this->wx_site_config = $this->config->item($GLOBALS['__WX_SITE_NAME__'], 'wxpay'); - if (!isset($GLOBALS['HTTP_RAW_POST_DATA'])) { + $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 = $GLOBALS['HTTP_RAW_POST_DATA']; + $xml = $raw_post_data; $xml_arr = from_xml($xml); // log_message('error',var_export($xml_arr, 1)); if ($this->check_sign($xml_arr) !== true) { From a06156b1cb0757f556b9653b2a6fbd39abf15593 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 22 Apr 2019 10:27:50 +0800 Subject: [PATCH 577/596] =?UTF-8?q?paypal=20Trippest=E7=AB=99=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E8=87=AA=E5=8A=A8=E5=BD=95=E5=85=A5=E8=AE=A2?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index e6ba1bd4..b844043f 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -986,22 +986,22 @@ class Index extends CI_Controller { return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail'); } //更新正确的订单信息到记录中，以这个为主 - $this->Note_model->set_invoice($item->pn_txn_id, $ht_tp_order->COLI_ID . '_B'); - $ssje = $this->Paypal_model->get_ssje($item->pn_mc_gross, '15002', mb_strtoupper($item->pn_mc_currency)); - $ht_memo = '交易号(自动录入):' . $item->pn_txn_id; + $this->Note_model->set_invoice($paypal_msg->pn_txn_id, $ht_tp_order->COLI_ID . '_B'); + $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; $this->Paypal_model->add_account_info( $ht_tp_order->COLI_SN, $ht_tp_order->COLI_ID, - $item->pn_mc_gross, - $item->pn_payment_date, - mb_strtoupper($item->pn_mc_currency), + $paypal_msg->pn_mc_gross, + $paypal_msg->pn_payment_date, + mb_strtoupper($paypal_msg->pn_mc_currency), $ssje, - $item->pn_payment_date, - $item->pn_payment_date, - $item->pn_payment_date, + $paypal_msg->pn_payment_date, + $paypal_msg->pn_payment_date, + $paypal_msg->pn_payment_date, '', - $item->pn_payer_email, - $item->pn_txn_id, + $paypal_msg->pn_payer_email, + $paypal_msg->pn_txn_id, $ht_memo ); From b8d580e40c880eff63ce0ce75feb2556b26ae95e Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 22 Apr 2019 10:52:08 +0800 Subject: [PATCH 578/596] =?UTF-8?q?=E5=BE=B7=E8=AF=AD=E7=AB=99=E5=9C=A8?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=8C=96=E6=9B=B4=E6=96=B0=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/bootstrap3/information_edit.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/views/bootstrap3/information_edit.php b/application/views/bootstrap3/information_edit.php index a2bf64f4..904c5b19 100644 --- a/application/views/bootstrap3/information_edit.php +++ b/application/views/bootstrap3/information_edit.php @@ -336,7 +336,7 @@ } //德语站点跳转测试页面 function goto_gmtest_page() { - var site_url = 'http://gm.test/gm.php/information/detail/?static_html_url='; + var site_url = 'http://gm.test/gm.php/information/detail/?cache=false&static_html_url='; $('#goto_test_page_button').attr("href", site_url + $('#ic_url').val()); return true; } From a93320bca0d040d9e0c1965bbe158a47c72b0751 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 23 Apr 2019 10:09:48 +0800 Subject: [PATCH 579/596] =?UTF-8?q?paypal=20Trippest=E7=9A=84=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E8=87=AA=E5=8A=A8=E5=BD=95=E5=85=A5=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 48 ++++++++++++------- .../paypal/models/paypal_model.php | 8 ++-- 2 files changed, 36 insertions(+), 20 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index b844043f..dcc4b8ea 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -647,7 +647,9 @@ 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'; @@ -979,14 +981,21 @@ class Index extends CI_Controller { public function trippest_note($orderid_info, $paypal_msg) { - $tp_orderid = "#" . substr($orderid_info->orderid, 10); + $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); + $ht_tp_order = $this->Paypal_model->get_trippest_order($tp_orderid, $real_orderid); if (empty($ht_tp_order)) { return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail'); } + $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 . '_B'); + $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; $this->Paypal_model->add_account_info( @@ -1004,20 +1013,25 @@ class Index extends CI_Controller { $paypal_msg->pn_txn_id, $ht_memo ); + if (false == $this->Paypal_model->if_biz_gai_exists($paypal_msg->pn_txn_id) ) { + $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, '15002'); + + $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'); + } - $opi_firstname = "David"; - $opi_email = "david@trippest.com"; - $orderid_info->orderid = $orderid_info->orderid . "#" . $tp_orderid; - $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 = $orderid_info->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'); $this->Note_model->update_send($paypal_msg->pn_txn_id, 'send'); } diff --git a/webht/third_party/paypal/models/paypal_model.php b/webht/third_party/paypal/models/paypal_model.php index c32c7a05..df8808e5 100644 --- a/webht/third_party/paypal/models/paypal_model.php +++ b/webht/third_party/paypal/models/paypal_model.php @@ -603,10 +603,12 @@ class Paypal_model extends CI_Model { return $this->HT->insert("BIZ_OrderOperationLog", $db_column); } - public function get_trippest_order($tp_order) + public function get_trippest_order($tp_order='', $real_orderid='') { $sql = "SELECT top 1 * from BIZ_ConfirmLineInfo - WHERE COLI_PriceMemo=? "; - return $this->HT->query($sql, array($tp_order))->row(); + 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(); } } From ab26a780cd58d92c97b9181295872aec335f5dc8 Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 24 Apr 2019 10:53:50 +0800 Subject: [PATCH 580/596] =?UTF-8?q?paypal=20Trippest=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E7=8B=AC=E7=AB=8B=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index dcc4b8ea..6b77fd14 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -998,25 +998,10 @@ class Index extends CI_Controller { $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; - $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 - ); if (false == $this->Paypal_model->if_biz_gai_exists($paypal_msg->pn_txn_id) ) { $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, '15002'); + $this->Paypal_model->update_paymanner($ht_tp_order->COLI_SN, '15010'); $opi_firstname = "David"; $opi_email = "david@trippest.com"; @@ -1031,6 +1016,21 @@ class Index extends CI_Controller { $M_State = 0; $this->Paypal_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'paypal note'); } + $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 + ); $this->Note_model->update_send($paypal_msg->pn_txn_id, 'send'); } @@ -1341,6 +1341,9 @@ class Index extends CI_Controller { $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'])) { @@ -1360,6 +1363,9 @@ class Index extends CI_Controller { $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); From 43b9bf720534b21dacc03eaaa7de2a1bdadbdff1 Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 24 Apr 2019 11:01:05 +0800 Subject: [PATCH 581/596] =?UTF-8?q?wxpay=20=E6=94=B6=E6=AC=BE=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E9=80=9A=E7=9F=A5=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/config/paypal.php | 2 + .../pay/controllers/PaymentService.php | 244 +++++++++++++++- .../pay/helpers/payment_helper.php | 8 +- .../models/Online_payment_account_model.php | 270 ++++++++++++++++++ .../pay/models/Online_payment_note_model.php | 35 ++- 5 files changed, 540 insertions(+), 19 deletions(-) diff --git a/webht/third_party/pay/config/paypal.php b/webht/third_party/pay/config/paypal.php index 70dcceaa..f0a6743a 100644 --- a/webht/third_party/pay/config/paypal.php +++ b/webht/third_party/pay/config/paypal.php @@ -1,4 +1,6 @@ load->helper('payment'); - // $this->config->load('wxpay', true); + $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'); } @@ -17,26 +20,245 @@ class PaymentService extends CI_Controller { } - public function send_notify($payment_method=NULL, $transactionId=NULL) + public function send_notify($transaction_id=NULL, $old_ssje=NULL) { - // $save_column['OPN_accountType'] = $xml_arr['']; - // $save_column['OPN_accountStatus'] = $xml_arr['']; - // $save_column['OPN_accountTime'] = $xml_arr['']; +log_message('error','send_notify begin ----'); +// exit(); $data = array(); - $int = 0; - + $show_index = 0; //优先处理指定的交易号，用于修正交易号直接发送通知 - if ( ! empty($transactionId)) { - $data['unsend_list'] = $this->note_model->get_note($payment_method, $transactionId); + if ( ! empty($transaction_id)) { + $data['unsend_list'] = $this->note_model->get_note($transaction_id); } // 待处理的 if (empty($data['unsend_list'])) { - $data['unsend_list'] = $this->note_model->unsend_note($payment_method, 10); + $data['unsend_list'] = $this->note_model->unsend_note(10); } //没有未处理的数据再查找处理失败的数据 if (empty($data['unsend_list'])) { - $data['unsend_list'] = $this->note_model->sendfail_note($payment_method, 20); + $data['unsend_list'] = $this->note_model->sendfail_note(20); + } + // 开始处理 + foreach ($data['unsend_list'] as $key => $item) { + //显示处理记录 + if (empty($transaction_id)) { + echo ++$show_index . ' ' . $item->OPN_transactionId . '
      '; + } + // 只处理完成状态 + 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($transaction_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, $item->OPN_accountMethod, mb_strtoupper($item->OPN_currency)); + $ssje = $old_ssje===NULL ? $ssje : $old_ssje; + $ht_memo = '交易号(自动录入):' . $item->OPN_transactionId; + if ( ! isset($advisor_info->ordertype)) { + // 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->ordertype == 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->ordertype == 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_templete', $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 + + $this->note_model->update_send($item->OPN_SN, $item->pn_txn_id, 'send'); + + + } + return; + // return $this->output->set_content_type('application/json')->set_output(json_encode($data)); + } + + /** 支付方式参数对应的配置文件名 */ + 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; + + case '15018': // iPaylinks + break; + + case '15015': // alipay + break; + + + default: + # code... + break; } + return $orderid_info; } } diff --git a/webht/third_party/pay/helpers/payment_helper.php b/webht/third_party/pay/helpers/payment_helper.php index 53ceac5e..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])) { diff --git a/webht/third_party/pay/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php index 3c19ea87..3a42e20e 100644 --- a/webht/third_party/pay/models/Online_payment_account_model.php +++ b/webht/third_party/pay/models/Online_payment_account_model.php @@ -23,5 +23,275 @@ class Online_payment_account_model extends CI_Model { 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') { + $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 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 index 86f4a9cc..5d0205e3 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -25,44 +25,65 @@ class Online_payment_note_model extends CI_Model { 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" => $send); + $where = " OPN_SN=" . $id; + return $this->update_note($where, $column); + } + 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; - $this->orderby = ' ORDER BY OPN_SN DESC '; + // 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.* + $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); + $query = $this->info->query($sql); return $query->result(); } - public function get_note($payment_method=NULL, $transactionId=null) + public function get_note($transactionId) { $this->init_query(); $this->topnum=1; - $this->transactionId = " AND opn.OPN_transactionId=" . $this->INFO->escape($transactionId); + $this->transactionId = " AND opn.OPN_transactionId=" . $this->info->escape($transactionId); return $this->query_note(); } - public function unsend_note($payment_method=NULL, $num=2) + public function unsend_note($num=2) { $this->init_query(); $this->topnum = $num; @@ -70,7 +91,7 @@ class Online_payment_note_model extends CI_Model { return $this->query_note(); } - public function sendfail_note($payment_method=NULL, $num=2) + public function sendfail_note($num=2) { $this->init_query(); $this->topnum = $num; From 52839d2b9a700b472ccbf3a80c8272774871b20c Mon Sep 17 00:00:00 2001 From: lyt Date: Wed, 24 Apr 2019 13:55:38 +0800 Subject: [PATCH 582/596] =?UTF-8?q?paypal=20Trippest=E7=AB=99=E7=9A=84?= =?UTF-8?q?=E6=94=B6=E6=AC=BE=E5=9C=A8=E6=9C=AA=E6=89=BE=E5=88=B0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=97=B6=E5=85=88=E9=82=AE=E4=BB=B6=E9=80=9A=E7=9F=A5?= =?UTF-8?q?,=E4=BB=A5=E9=98=B2=E6=AD=A2=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=BC=8F=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/paypal/controllers/index.php | 88 +++++++++++-------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 6b77fd14..95d898fa 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -981,6 +981,7 @@ class Index extends CI_Controller { 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') { @@ -990,49 +991,62 @@ class Index extends CI_Controller { // 获取HT订单号 $ht_tp_order = $this->Paypal_model->get_trippest_order($tp_orderid, $real_orderid); if (empty($ht_tp_order)) { - return $this->Note_model->update_send($paypal_msg->pn_txn_id, 'sendfail'); + /** + * 此处不直接退出是为了:在(邮件订单不能自动录入/未收到新订单邮件)时也能通知外联已收款,防止漏单 + * 本方法内-以下的非空判断同理: !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'); } - $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) ) { - $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'); - - $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'); + 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->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 - ); - $this->Note_model->update_send($paypal_msg->pn_txn_id, 'send'); + $this->Note_model->update_send($paypal_msg->pn_txn_id, $send_type); } //所有记录列表 From bca4b6640a67c7ac933478b4805fa5b007d64bb8 Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 25 Apr 2019 09:34:12 +0800 Subject: [PATCH 583/596] =?UTF-8?q?Alipay=20=E6=9F=A5=E8=AF=A2=E9=80=80?= =?UTF-8?q?=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/AlipayTradeService.php | 24 +++++++++++++++++-- .../models/AlipayTradeQueryContentBuilder.php | 15 ++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 709e64bf..1a64536b 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -531,6 +531,26 @@ class AlipayTradeService extends CI_Controller 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)); + } + /*! * 对账单 * 流程: @@ -546,8 +566,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); 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; + } + } ?> From 5e1274f69f9954df41286ceaa7e9ba341162d92c Mon Sep 17 00:00:00 2001 From: lyt Date: Thu, 25 Apr 2019 09:56:54 +0800 Subject: [PATCH 584/596] =?UTF-8?q?Alipay=E6=94=B6=E6=AC=BE=E7=A0=81?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8D=E6=94=B6=E6=89=8B=E7=BB=AD=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index 1a64536b..f9db3a3c 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -402,7 +402,10 @@ class AlipayTradeService extends CI_Controller //没有分配订单之前先添加付款记录,这个过程可能会执行多次，必须在添加记录前查找是否有数据 if (!empty($orderid_info)) { $currencyCode = str_replace("CNY", "RMB", trim(mb_strtoupper($item->ALI_currencyCode))); - $ssje = $this->Alipay_model->get_ssje($item->ALI_orderAmount, $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) { @@ -653,7 +656,7 @@ var_dump($response->$responseNode); ,"CNY" ,strval($query_pay->total_amount) ,NULL - ,NULL + ,1 // 此处1表示通过收款码进来的, 不收手续费, 后续录入时分别处理 ,strval($query_pay->send_pay_date) ,strval($query_pay->send_pay_date) ,json_encode($query_pay) From 83460c7eea52d1e008e9c3a212535c896778efc9 Mon Sep 17 00:00:00 2001 From: cyc Date: Thu, 25 Apr 2019 13:35:44 +0800 Subject: [PATCH 585/596] =?UTF-8?q?=E6=90=AC=E8=BF=81123=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E5=88=B0=E4=BF=A1=E6=81=AF=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../third_party/trainsystem/config/config.php | 107 +++ .../trainsystem/config/constants.php | 4 + .../trainsystem/controllers/addorders.php | 676 ++++++++++++++++++ .../trainsystem/controllers/api.php | 342 +++++++++ .../trainsystem/controllers/callback.php | 320 +++++++++ .../trainsystem/controllers/check.php | 528 ++++++++++++++ .../trainsystem/controllers/orders.php | 18 + .../trainsystem/controllers/pages.php | 208 ++++++ .../trainsystem/controllers/returnorders.php | 153 ++++ .../trainsystem/helpers/train_helper.php | 89 +++ .../third_party/trainsystem/libraries/Des.php | 59 ++ .../trainsystem/models/BIZ_train_model.php | 492 +++++++++++++ .../trainsystem/models/sendmail_model.php | 157 ++++ .../trainsystem/models/train_system_model.php | 267 +++++++ .../trainsystem/views/addorders.php | 0 .../trainsystem/views/common/footer.php | 43 ++ .../trainsystem/views/common/header.php | 131 ++++ .../third_party/trainsystem/views/email.php | 33 + .../trainsystem/views/email_before.php | 48 ++ .../trainsystem/views/email_fault.php | 26 + .../third_party/trainsystem/views/export.php | 110 +++ .../third_party/trainsystem/views/footer.php | 43 ++ .../third_party/trainsystem/views/header.php | 156 ++++ .../trainsystem/views/homepage.php | 511 +++++++++++++ .../third_party/trainsystem/views/order.php | 64 ++ .../trainsystem/views/order_list.php | 101 +++ .../third_party/trainsystem/views/refund.php | 48 ++ .../views/train_transaction_excel.php | 178 +++++ 28 files changed, 4912 insertions(+) create mode 100644 application/third_party/trainsystem/config/config.php create mode 100644 application/third_party/trainsystem/config/constants.php create mode 100644 application/third_party/trainsystem/controllers/addorders.php create mode 100644 application/third_party/trainsystem/controllers/api.php create mode 100644 application/third_party/trainsystem/controllers/callback.php create mode 100644 application/third_party/trainsystem/controllers/check.php create mode 100644 application/third_party/trainsystem/controllers/orders.php create mode 100644 application/third_party/trainsystem/controllers/pages.php create mode 100644 application/third_party/trainsystem/controllers/returnorders.php create mode 100644 application/third_party/trainsystem/helpers/train_helper.php create mode 100644 application/third_party/trainsystem/libraries/Des.php create mode 100644 application/third_party/trainsystem/models/BIZ_train_model.php create mode 100644 application/third_party/trainsystem/models/sendmail_model.php create mode 100644 application/third_party/trainsystem/models/train_system_model.php create mode 100644 application/third_party/trainsystem/views/addorders.php create mode 100644 application/third_party/trainsystem/views/common/footer.php create mode 100644 application/third_party/trainsystem/views/common/header.php create mode 100644 application/third_party/trainsystem/views/email.php create mode 100644 application/third_party/trainsystem/views/email_before.php create mode 100644 application/third_party/trainsystem/views/email_fault.php create mode 100644 application/third_party/trainsystem/views/export.php create mode 100644 application/third_party/trainsystem/views/footer.php create mode 100644 application/third_party/trainsystem/views/header.php create mode 100644 application/third_party/trainsystem/views/homepage.php create mode 100644 application/third_party/trainsystem/views/order.php create mode 100644 application/third_party/trainsystem/views/order_list.php create mode 100644 application/third_party/trainsystem/views/refund.php create mode 100644 application/third_party/trainsystem/views/train_transaction_excel.php diff --git a/application/third_party/trainsystem/config/config.php b/application/third_party/trainsystem/config/config.php new file mode 100644 index 00000000..7e4ddb07 --- /dev/null +++ b/application/third_party/trainsystem/config/config.php @@ -0,0 +1,107 @@ +"待处理", + "1"=>"失效订单", + "2"=>"待支付", + "3"=>"已支付，待出票", + "4"=>"出票成功", + "5"=>"出票失败", + "6"=>"线上退票处理中", + "7"=>"有乘客退票(改签)成功", + "8"=>"乘客退票失败", + "e"=>"数据错误，提交失败" + ); + +//座次配对 +$config["train_zw"]=array( + "O"=>"二等座", + "9"=>"商务座", + "P"=>"特等座", + "6"=>"高级软卧", + "M"=>"一等座", + "4"=>"软卧", + "2"=>"软座", + "3"=>"硬卧", + "1"=>"硬座", + "F"=>"动卧" + ); +//数据库座次配对,包厢硬卧(5),无座(WZ),聚合没有 +$config["db_train_zw"]=array( + "9"=>"9", + "P"=>"P", + "M"=>"M", + "7"=>"M", + "O"=>"O", + "8"=>"O", + "6"=>"6", + "A"=>"6", + "S"=>"4", + "4"=>"4", + "F"=>"F", + "3"=>"3", + "2"=>"2", + "1"=>"1" + ); +//票种配对 +$config["train_piaotype"]=array( + "1"=>"成人票", + "2"=>"儿童票", + "3"=>"学生票", + "4"=>"残军票" + ); + +//证件类型配对 +$config["train_passportty"]=array( + "B"=>"护照", + "1"=>"二代身份证", + "2"=>"一代身份证", + "C"=>"港澳通行证", + "G"=>"台湾通行证" + ); + +//黑名单用户 +$config['black_list'] = array('209582910','539152642','506157109','E66735489','E66735492','E80377215','G23001338','E95287649','345276546','PA4286015','G09382769','G26113116','G25996274','572309763','506620366','505897939','E71156367','E21961674','v716898','561669436','EL657289','533300106','482225223','514815909','592108236','370682199509218814','130924199003161572','410728199011287038','372324199503253215','ED6234008'); + +//设置session 2592000 +$config['sess_cookie_name'] = 'trainsystem'; +$config['sess_expiration'] = 2592000; \ No newline at end of file diff --git a/application/third_party/trainsystem/config/constants.php b/application/third_party/trainsystem/config/constants.php new file mode 100644 index 00000000..9d315fd5 --- /dev/null +++ b/application/third_party/trainsystem/config/constants.php @@ -0,0 +1,4 @@ +load->model("BIZ_train_model"); + $this->load->model("train_system_model"); + $this->load->helper('train'); + $this->db_train_zw = $this->config->item('db_train_zw'); + $this->train_zw = $this->config->item('train_zw'); + $this->black_list = $this->config->item('black_list'); + $this->isauto = 0; + } + + public function index(){ + echo 'api manager'; + } + + //自动出票 + public function auto_pay_ticket(){ + //log_message('error','auto ticket'); + date_default_timezone_set('Asia/Shanghai'); + //判断账户余额，如果小于1000自动退出。 + $post_data = array("key"=>JUHE_TRAIN_API_KEY); + $back_data = GetPost_http("http://op.juhe.cn/trainTickets/balance.php",$post_data); + $price = json_decode($back_data)->result; + print_r('账户余额：'.$price); + if($price < 1000){ + exit('账户余额不足'); + } + //筛选出能自动出票的订单 + $auto_pool = $this->BIZ_train_model->auto_check_ticket(); + + //创建一个不允许自动出票的国际火车票数组 + $nation_train = array('K19', 'K23', 'Z8701', 'Z8702', 'Z97', 'Z98', 'Z99', 'Z100', 'K9795'); + + //创建黑名单 + $black_list = $this->config->item('black_list'); + $string = ''; + foreach($auto_pool as $item){ + $this->isauto = 1; + $bpe_sn = ''; + $back_message = ''; + $cold_sn = $item->COLD_SN; + $coli_id = $item->coli_id; + $back_data = 1; + + $people_arr = $this->BIZ_train_model->biz_people($cold_sn); + $train_info = $this->BIZ_train_model->get_biz_foi($cold_sn); + + if($item->COLD_SPFS > 1){ + //寄送票 + $back_data = 0; + $back_message .= '-邮寄不自动出票'; + } + + //乘客人数大于5人不出票 + if(count($people_arr) > 5){ + $back_data = 0; + $back_message .= '-乘客人数大于5不自动出票'; + } + + //护照号如果在黑名单的就不自动出票 + foreach($people_arr as $people_info){ + if(in_array($people_info->BPE_Passport,$black_list)){ + $back_data = 0; + $back_message .= '-此用户为黑名单用户，不自动出票'; + } + + if(strlen($people_info->BPE_Passport) >= 18){ + $back_data = 0; + $back_message .= '-护照位数大于18不自动出票'; + } + + $bpe_sn .= $people_info->BPE_SN.','; + } + $bpe_sn = substr($bpe_sn,0,strlen($bpe_sn)-1); + + //单张票价不能大于1000人民币 + if($train_info[0]->adultcost > 1000){ + $back_data = 0; + $back_message .= '-单价大于1000不自动出票'; + } + + //如果为国际火车票就不出票 + if(in_array($train_info[0]->FlightsNo, $nation_train)){ + $back_data = 0; + $back_message .= '-国际火车票不自动出票'; + } + + //无座的订单不做出票 + if($train_info[0]->Aircraft == 'WZ'){ + $back_data = 0; + $back_message .= '-无座不自动出票'; + } + + //香港火车不自动出票 + if($train_info[0]->DepartAirport == 'XJA'){ + $back_data = 0; + $back_message .= '-香港火车不自动出票'; + } + + $DepartureDate = strtotime($train_info[0]->DepartureDate); + $time = time(); + $depart_diff = ($DepartureDate - $time) / 86400; + + if($train_info[0]->ArrivalAirport == 'XJA' && $train_info[0]->adultcost > 500 && $depart_diff > 5){ + $back_data = 0; + $back_message .= '-内地香港火车金额大于500超过五天不自动出票'; + } + //print_r($train_info); + + //如果刚好是第三十天的订单 + echo $item->COLI_State; + if(($item->COLI_State == '8' || $item->COLI_State == '63')){ + $this->isauto = 3; + $time_obj = $this->BIZ_train_model->get_saletime($train_info['0']->DepartAirport_cn); + //print_r($time_obj); + if(!empty($time_obj)){ + $saletime = strtotime($time_obj->TST_saletime); + //echo $saletime; + $sale_diff = (time() - $saletime) / 3600; + if($sale_diff > 1){ + $back_data = 0; + $back_message .= '-超过抢票时间'; + }else if($sale_diff <0){ + $back_data = 0; + $back_message .= '-未到抢票时间'; + } + } + } + + if($back_data == 0){ + $string .= '汉特订单号：'.$coli_id.'('.$cold_sn.')'.$back_message.''; + }else{ + //单个订单提交 + echo $cold_sn.'
      '; + $this->booktickets($cold_sn,$bpe_sn,'','juhe'); + //$string .= '汉特订单号：'.$coli_id.'('.$cold_sn.')可以自动出票'; + } + } + print_r(''.$string.'
      '); + } + + //创建一个方法用于接收所有的出票请求 + public function booktickets($cold_sn=null,$bpe_sn=null,$selectseat=null,$type=null){ + if(empty($cold_sn) && empty($bpe_sn)){ + //接收子表订单号 + $cold_sn = $this->input->get_post('order'); + //接收客人表sn + $bpe_sn = $this->input->get_post("people"); + //接收选座字符串 + $selectseat = $this->input->get_post("selectseat"); + //接收出票接口 + $type = $this->input->get_post("type"); + } + //测试数据 + /*$cold_sn = '488121613'; + $bpe_sn = '473183645,473183646,473183647'; + $selectseat = ''; + $type = 'juhe';*/ + + if(!is_numeric($cold_sn)){ + $reback["mes"]="订单号是数字"; + echo json_encode($reback); + return false; + } + + if(empty($bpe_sn)){ + $reback["mes"]="请选择乘客"; + echo json_encode($reback); + return false; + } + + $data['train'] = $this->BIZ_train_model->biz_order_detail($cold_sn); + $data['people_list']=$this->BIZ_train_model->in_bpesn_people_info($bpe_sn); + + if($selectseat == ''){ + $selectseat = ''; + $train_select = $data['train']->FOI_SelectedSeat; + $obj = explode(',',$train_select); + foreach($obj as $value){ + $selectseat .= $value; + } + } + + if (empty($data['train'])) { + //显示错误,找不到车次 + $reback["mes"]="找不到车次"; + echo json_encode($reback); + return false; + } + + if (empty($data['people_list'])) { + //显示错误，找不到用户信息 + $reback["mes"]="找不到乘客信息"; + echo json_encode($reback); + return false; + } + + if (count($data['people_list']) > 5) { + //显示错误，用户超过五个 + $reback["mes"]="乘客不能超过五个"; + echo json_encode($reback); + return false; + } + + switch ($type){ + case 'juhe': + $this->juheModel($data,$selectseat,$cold_sn); + break; + case 'tuniu': + $this->tuniuModel($data,$selectseat,$cold_sn); + break; + case 'ctrip': + $this->ctripModel($data,$selectseat,$cold_sn); + break; + } + } + + function juheModel($data=null,$selectseat=null,$cold_sn=null){ + $zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码 + $zwname = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; //座位名称 + + //进行提交字符串的拼接 + $passengers = ""; + foreach ($data['people_list'] as $key => $item) { + //乘客姓名 + $passengersename = $item->BPE_FirstName.$item->BPE_MiddleName.$item->BPE_LastName; + //将特殊字符转换为正常字符以便于出票 + $passengersename = chk_sp_name($passengersename); + //乘客类型 + switch ($item->BPE_GuestType) { + case 1: + $piaotype = 1; + $piaotypename = "成人票"; + break; + case 2: + $piaotype = 2; + $piaotypename = "儿童票"; + break; + default://外国人应该就两种票吧 + $piaotype = 1; + $piaotypename = "成人票"; + break; + } + + //证件类型 + switch ($item->BPE_PassportType){ + case 'Chinese ID': + $passporttypeseid = "1"; + $passporttypeseidname = "二代身份证"; + break; + case 'Travel Permit from Hong Kong / Macau': + $passporttypeseid = "C"; + $passporttypeseidname = "港澳通行证"; + break; + case 'Travel Permit from Taiwan': + $passporttypeseid = "G"; + $passporttypeseidname = "台湾通行证"; + break; + default : + $passporttypeseid = "B"; + $passporttypeseidname = "护照"; + break; + } + + switch ($item->BPE_SEX){ + case '100003': + $sex = 'F'; + break; + case '100001': + $sex = 'M'; + break; + } + + $passportseno = str_replace(' ','',$item->BPE_Passport); + + //添加一个判断护照号是否在黑名单 + if(in_array($passportseno,$this->black_list)){ + $reback["mes"] = "乘客为黑名单用户"; + echo json_encode($reback); + return false; + } + + if($passporttypeseid == 'G'){ + $passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"1","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'"}'; + }else{ + $passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"1","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '"}'; + } + + } + + $passengers .= "]"; + $passengers = substr($passengers, 1); + $passengers = "[" . $passengers; + if(empty($selectseat)){ + $post_data=array( + "key"=>JUHE_TRAIN_API_KEY, + "user_orderid"=>$cold_sn,//自定义订单号 + "train_date"=>substr($data["train"]->DepartureDate, 0, 10), + "is_accept_standing"=>"no", + "from_station_name"=>$data["train"]->DepartAirport_cn, + "from_station_code"=>$data["train"]->DepartAirport, + "to_station_code"=>$data["train"]->ArrivalAirport, + "to_station_name"=>$data["train"]->ArrivalAirport_cn, + "passengers"=>$passengers, + "checi"=>$data["train"]->FlightsNo + ); + }else{ + $post_data=array( + "key"=>JUHE_TRAIN_API_KEY, + "user_orderid"=>$cold_sn,//自定义订单号 + "train_date"=>substr($data["train"]->DepartureDate, 0, 10), + "is_accept_standing"=>"no", + "choose_seats"=>$selectseat, + "from_station_name"=>$data["train"]->DepartAirport_cn, + "from_station_code"=>$data["train"]->DepartAirport, + "to_station_code"=>$data["train"]->ArrivalAirport, + "to_station_name"=>$data["train"]->ArrivalAirport_cn, + "passengers"=>$passengers, + "checi"=>$data["train"]->FlightsNo + ); + } + + //发起请求 + $add_data = new stdClass(); + $back_json = GetPost_http('http://op.juhe.cn/trainTickets/submit',$post_data); + $back_data = json_decode($back_json); + + if(!$back_data->error_code){ + $add_data->ordernumber = $back_data->result->orderid; + $reback["status"] = 1; + $reback["order"] = $back_data->result->orderid; + $reback["mes"] = "订单提交成功，等待回调"; + }else{ + $add_data->ordernumber=null; + $reback["mes"] = $back_json; + $add_data->status = "e"; + } + + //本地订单入库 + $add_data->cold_sn = $cold_sn; + $add_data->returncode = $back_data->error_code; + $add_data->status = '2'; + $add_data->errormsg = '预定中'; + $add_data->checi = $data['train']->FlightsNo; + $add_data->fromstationame = $data['train']->DepartAirport_cn; + $add_data->fromstationcode = $data['train']->DepartAirport; + $add_data->tostationame = $data['train']->ArrivalAirport_cn; + $add_data->tostationcode = $data['train']->ArrivalAirport; + $add_data->startdate = date('Y-m-d',strtotime($data['train']->DepartureDate)); + $add_data->startime = date('H:i',strtotime($data['train']->DepartureTime)); + $add_data->endtime = date('H:i',strtotime($data['train']->ArrivalTime)); + $add_data->runtime = (strtotime($data['train']->ArrivalTime) - strtotime($data['train']->DepartureTime)) / 60; + $add_data->channel = 'juhe'; + $add_data->isauto = $this->isauto; + + $this->train_system_model->add_orders($add_data); + echo json_encode($reback); + return false; + + } + + function tuniuModel($data,$selectseat,$cold_sn){ + $this->load->library('Des'); + $zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码 + $zwname = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; //座位名称 + + $passengers=""; + //$cold_sn = $cold_sn.'_'.time(); + + //拼接车次信息 + $tuniu_data = '{'; + $tuniu_data .= '"retailOrderId":"'.$cold_sn.'",'; + $tuniu_data .= '"cheCi": "'.$data['train']->FlightsNo.'", '; + $tuniu_data .= '"fromStationCode": "'.$data['train']->DepartAirport.'", '; + $tuniu_data .= '"fromStationName": "'.$data['train']->DepartAirport_cn.'", '; + $tuniu_data .= '"toStationCode": "'.$data['train']->ArrivalAirport.'", '; + $tuniu_data .= '"toStationName": "'.$data['train']->ArrivalAirport_cn.'", '; + $tuniu_data .= '"trainDate": "'.substr($data["train"]->DepartureDate, 0, 10).'", '; + $tuniu_data .= '"callBackUrl": "http://www.mycht.cn/info.php/apps/train/tuniu_callback/book",'; + $tuniu_data .= '"hasSeat": true,'; + $tuniu_data .= '"contact": "陈宇超",'; + $tuniu_data .= '"phone": "18877381547",'; + $tuniu_data .= '"isChooseSeats": true,'; + $tuniu_data .= '"chooseSeats":"'.$selectseat.'",'; + + //循环乘客 + $passengers = ''; + foreach ($data['people_list'] as $key => $item) { + $passengers .= '{'; + $passengers .= '"passengerId":'.$key.','; + $passengers .= '"ticketNo":"null",'; + //乘客姓名 + $passengersename = str_replace(' ','',$item->BPE_FirstName) . str_replace(' ','',$item->BPE_MiddleName) . str_replace(' ','',$item->BPE_LastName); + //将特殊字符转换为正常字符以便于出票 + $passengersename = chk_sp_name($passengersename); + $passengers .= '"passengerName":"'.$passengersename.'",'; + $passportseno = str_replace(' ','',$item->BPE_Passport); + + $passengers .= '"passportNo":"'.$passportseno.'",'; + + //证件类型 + switch ($item->BPE_PassportType){ + case 'Chinese ID': + $passporttypeseid = "1"; + $passporttypeseidname = "二代身份证"; + break; + case 'Travel Permit from Hong Kong / Macau': + $passporttypeseid = "C"; + $passporttypeseidname = "港澳通行证"; + break; + case 'Travel Permit from Taiwan': + $passporttypeseid = "G"; + $passporttypeseidname = "台湾通行证"; + break; + default : + $passporttypeseid = "B"; + $passporttypeseidname = "护照"; + break; + } + + //乘客类型 + switch ($item->BPE_GuestType) { + case 1: + $piaotype = 1; + $piaotypename = "成人票"; + break; + case 2: + $piaotype = 2; + $piaotypename = "儿童票"; + break; + default://外国人应该就两种票吧 + $piaotype = 1; + $piaotypename = "成人票"; + break; + } + + $passengers .= '"passportTypeId":"'.$passporttypeseid.'",'; + $passengers .= '"passportTypeName":"'.$passporttypeseidname.'",'; + + //票类型 + $passengers .= '"piaoType":"'.$item->BPE_GuestType.'",'; + $passengers .= '"piaoTypeName":"'.$piaotypename.'",'; + + //座位类型piaoTypeName + $passengers .= '"zwCode":"'.$zwcode.'",'; + $passengers .= '"zwName":"'.$zwname.'",'; + + $passengers .= '"cxin":"null",'; + $passengers .= '"price":"'.$data['train']->adultcost.'",'; + $passengers .= '"reason": 0'; + $passengers .= '},'; + } + + $passengers = substr($passengers,0,strlen($passengers)-1); + $passengers = '['.$passengers.']'; + $tuniu_data .= '"passengers": '.$passengers.'}'; + + //print_r($tuniu_data); + + $crypt = new DES(); + $mstr = $crypt->encrypt($tuniu_data,TUNIU_KEY); + $post_data = '{ + "apiKey": "'.TUNIU_KEY.'", + "sign": "'.create_sign().'", + "timestamp": "'.date('Y-m-d H:i:s',time()).'", + "data": "'.$mstr.'" + }'; + + $url = TUNIU_URL.'/train/book'; + $book_back_json = GetPost_http($url,$post_data,'POST','json'); + $book_back_data = json_decode($book_back_json); + + $orderId = $book_back_data->data->orderId; + $retailOrderId = $book_back_data->data->retailOrderId; + + if($book_back_data->success == 1){ + $confirm_url = TUNIU_URL.'/train/confirm'; + $sign = create_sign(); + $time = date('Y-m-d H:i:s',time()); + $post_data = '{ + "apiKey": "'.TUNIU_KEY.'", + "sign": "'.$sign.'", + "timestamp": "'.$time.'", + "data": { + "retailOrderId":"'.$retailOrderId.'", + "orderId":"'.$orderId.'", + "callBackUrl":"http://www.mycht.cn/info.php/apps/train/tuniu_callback/confirm" + } + }'; + //请求出票 + $confirm_back_json = GetPost_http($confirm_url,$post_data,'POST','json'); + $confirm_back_data = json_decode($confirm_back_json); + $reback["status"] = 1; + $reback["order"] = $orderId; + $reback["mes"] = "订单提交成功，等待回调"; + }else{ + $reback["mes"] = $confirm_back_json; + $add_data->status = "e"; + } + + //本地订单入库 + $add_data = new stdClass(); + $add_data->cold_sn = $retailOrderId; + $add_data->ordernumber = $orderId; + $add_data->returncode = $confirm_back_data->returnCode; + $add_data->status = '2'; + $add_data->errormsg = '预定中'; + $add_data->checi = $data['train']->FlightsNo; + $add_data->fromstationame = $data['train']->DepartAirport_cn; + $add_data->fromstationcode = $data['train']->DepartAirport; + $add_data->tostationame = $data['train']->ArrivalAirport_cn; + $add_data->tostationcode = $data['train']->ArrivalAirport; + $add_data->startdate = date('Y-m-d',strtotime($data['train']->DepartureDate)); + $add_data->startime = date('H:i',strtotime($data['train']->DepartureTime)); + $add_data->endtime = date('H:i',strtotime($data['train']->ArrivalTime)); + $add_data->runtime = (strtotime($data['train']->ArrivalTime) - strtotime($data['train']->DepartureTime)) / 60; + $add_data->channel = 'tuniu'; + $add_data->isauto = 0; + + $this->train_system_model->add_orders($add_data); + echo json_encode($reback); + return false; + } + + function ctripModel($data,$selectseat,$cold_sn){ + $zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码 + $zwname = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; //座位名称 + $OrderNumber = ORDERUSER.time(); + //拼接发送的报文 + $PostData = array(); + $TimeStamp = time(); + $time = date('Y-m-d H:i:s',$TimeStamp); + $PostData['Authentication']->TimeStamp = $time; + $PostData['Authentication']->ServiceName = 'order.PartnerAddOrder'; + $PostData['Authentication']->PartnerName = ORDERUSER; + $MessageIdentity = md5($time.'order.PartnerAddOrder'.ORDERKEY); + $PostData['Authentication']->MessageIdentity = $MessageIdentity; + + $PostData['TrainOrderService']->PartnerName = ORDERUSER; + $PostData['TrainOrderService']->Operation = ''; + $PostData['TrainOrderService']->OrderType = '电子'; + $PostData['TrainOrderService']->OrderTicketType = '0'; + $PostData['TrainOrderService']->OrderNumber = $OrderNumber; + $PostData['TrainOrderService']->ChannelName = ORDERUSER; + + $PostData['TrainOrderService']->Order->OrderTime = $time; + $PostData['TrainOrderService']->Order->OrderMedia = 'pc'; + $PostData['TrainOrderService']->Order->Insurance = 'N'; + $PostData['TrainOrderService']->Order->Invoice = 'N'; + $PostData['TrainOrderService']->Order->PrivateCustomization = '0'; + + $PostData['TrainOrderService']->Order->TicketItem->FromStationName = $data['train']->DepartAirport_cn; + $PostData['TrainOrderService']->Order->TicketItem->ToStationName = $data['train']->ArrivalAirport_cn; + $PostData['TrainOrderService']->Order->TicketItem->TicketTime = date('Y-m-d H:i:s',strtotime($data['train']->DepartureTime)); + $PostData['TrainOrderService']->Order->TicketItem->TrainNumber = $data['train']->FlightsNo; + $PostData['TrainOrderService']->Order->TicketItem->ArrivalDateTime = date('Y-m-d H:i:s',strtotime($data['train']->ArrivalTime)); + $PostData['TrainOrderService']->Order->TicketItem->TicketPrice = $data['train']->adultcost; + $PostData['TrainOrderService']->Order->TicketItem->TicketCount = count($data['people_list']); + + $AdultNum = 0; + $ChildNum = 0; + $Passport = ''; + foreach ($data['people_list'] as $PassagerInfo){ + //乘客类型 + switch ($PassagerInfo->BPE_GuestType) { + case 1: + $PiaoType = 1; + $PiaoTypeName = "成人票"; + $AdultNum++; + break; + case 2: + $PiaoType = 2; + $PiaoTypeName = "儿童票"; + $ChildNum++; + break; + default://外国人应该就两种票吧 + $PiaoType = 1; + $PiaoTypeName = "成人票"; + break; + } + + //证件类型 + switch ($PassagerInfo->BPE_PassportType){ + case 'Chinese ID': + $PassportTypeseId = "1"; + $PassportTypeseidName = "二代身份证"; + break; + case 'Travel Permit from Hong Kong / Macau': + $PassportTypeseidName = "港澳通行证"; + break; + case 'Travel Permit from Taiwan': + $PassportTypeseId = "G"; + $PassportTypeseidName = "台湾通行证"; + break; + default : + $PassportTypeseId = "B"; + $PassportTypeseidName = "护照"; + break; + } + //$Passport .= chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0|'; + + if($PiaoType == 1){ + $RelatioNme = chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName); + $Passport .= chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0|'; + }elseif($PiaoType == 2){ + $Passport .= $RelatioNme.','.$PassportTypeseidName.','.$PassagerInfo->BPE_Passport.','.$PiaoTypeName.','.''.',0,'.chk_sp_name($PassagerInfo->BPE_FirstName.$PassagerInfo->BPE_MiddleName.$PassagerInfo->BPE_LastName).'|'; + } + + } + + $PostData['TrainOrderService']->Order->TicketItem->AuditTicketCount = $AdultNum; + $PostData['TrainOrderService']->Order->TicketItem->ChildTicketCount = $ChildNum; + $PostData['TrainOrderService']->Order->TicketItem->SeatName = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; + $PostData['TrainOrderService']->Order->TicketItem->SelectedSeat = $selectseat; + $PostData['TrainOrderService']->Order->TicketItem->AcceptSeat = ''; + $PostData['TrainOrderService']->Order->TicketItem->passport = substr($Passport,0,strlen($Passport)-1); + $PostData['TrainOrderService']->Order->TicketItem->OrderPrice = $data['train']->adultcost * $AdultNum + $data['train']->childcost * $ChildNum; + + $PostData['TrainOrderService']->Order->FrontSeatFlag = '0'; + + $PostData['TrainOrderService']->Order->User->UserID = ''; + $PostData['TrainOrderService']->Order->User->UserName = 'guilintravel'; + $PostData['TrainOrderService']->Order->User->userLoginName = 'guilintravel'; + $PostData['TrainOrderService']->Order->User->UserMobile = '18877381547'; + //print_r($PostData);die(); + //本地添加记录 + $add_data = new stdClass(); + $add_data->cold_sn = $cold_sn; + $add_data->ordernumber = $OrderNumber; + $add_data->returncode = ''; + $add_data->status = '2'; + $add_data->errormsg = '预定中'; + $add_data->checi = $data['train']->FlightsNo; + $add_data->fromstationame = $data['train']->DepartAirport_cn; + $add_data->fromstationcode = $data['train']->DepartAirport; + $add_data->tostationame = $data['train']->ArrivalAirport_cn; + $add_data->tostationcode = $data['train']->ArrivalAirport; + $add_data->startdate = date('Y-m-d',strtotime($data['train']->DepartureDate)); + $add_data->startime = date('H:i',strtotime($data['train']->DepartureTime)); + $add_data->endtime = date('H:i',strtotime($data['train']->ArrivalTime)); + $add_data->runtime = (strtotime($data['train']->ArrivalTime) - strtotime($data['train']->DepartureTime)) / 60; + $add_data->channel = 'ctrip'; + $add_data->isauto = 0; + + + //存储到数据库 + $this->train_system_model->add_orders($add_data); + + $Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerAddOrder'; + $ResponseJson = GetPost_http($Url,json_encode($PostData),'POST'); + $ResponseData = json_decode($ResponseJson); + + //echo '预定'; + //print_r($ResponseData); + + //预定请求成功后执行支付 + if($ResponseData->Status == 'SUCCESS'){ + //计算订单总价，进行支付 + $total_price = $AdultNum * $data['train']->adultcost + $ChildNum * $data['train']->childcost; + $this->payorders($OrderNumber,$total_price); + $reback["status"] = 1; + $reback["order"] = $OrderNumber; + $reback["mes"] = "订单提交成功，等待回调"; + }else{ + $reback["mes"] = $ResponseJson; + $add_data->status = "e"; + } + echo json_encode($reback); + } +} \ No newline at end of file diff --git a/application/third_party/trainsystem/controllers/api.php b/application/third_party/trainsystem/controllers/api.php new file mode 100644 index 00000000..7091dbfd --- /dev/null +++ b/application/third_party/trainsystem/controllers/api.php @@ -0,0 +1,342 @@ +load->helper('train'); + $this->load->model("BIZ_train_model"); + $this->load->model("train_system_model"); + $this->load->model("Sendmail_model"); + } + + public function index(){ + echo 'api manager'; + } + + //获取订单出票状态 + public function isbooktickets(){ + $cold_sn = $this->input->get('cold_sn'); + + $tickets_info = $this->train_system_model->get_tickets_info($cold_sn); + //print_r($tickets_info); + if(!empty($tickets_info)){ + $return_data = array(); + $i = 0; + foreach($tickets_info as $items){ + $return_data[$i]->cold_sn = (int) $items->ts_cold_sn; + $return_data[$i]->ordernumber = $items->ts_ordernumber; + $return_data[$i]->status = $items->tst_status; + $return_data[$i]->passengersename = $items->tst_realname; + $return_data[$i]->passportseno = $items->tst_numberid; + $i++; + } + print_r(json_encode($return_data)); + }else{ + return null; + } + + } + + //用于自动发送确认信 + public function send_confirmmail(){ + //log_message('error','auto sendmail'); + $mailarr = $this->BIZ_train_model->auto_sendmail(); + foreach($mailarr as $obj){ + $coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($obj->ts_cold_sn); + $coli_id = $coli_id[0]->COLI_ID; + $juhe_order = $obj->ts_ordernumber; + $this->send_mail_to_guest($coli_id,$juhe_order); + } + } + + //发邮件给客人 + function send_mail_to_guest($coli_id,$jh_order){ + $info = $this->BIZ_train_model->get_user_info($jh_order); + $guest = $this->BIZ_train_model->get_guest_info($coli_id); + //print_r($guest); + $operator_info = $this->BIZ_train_model->get_operatorInfo($coli_id); + $fromName = $operator_info[0]->Name; + $fromEmail = $operator_info[0]->OPI_Email; + $toName = $guest[0]->GUT_LastName.$guest[0]->GUT_FirstName; + $toEmail = $guest[0]->GUT_Email;// + $data['coli_id'] = $coli_id; + $data['toname'] = $toName; + $data['adult'] = $info->COLD_PersonNum; + $data['chlid'] = $info->COLD_ChildNum; + $data['baby'] = $info->COLD_BabyNum; + $data['price'] = $this->BIZ_train_model->get_paypal($coli_id); + $data['allpeople'] = $this->BIZ_train_model->biz_people($info->COLD_SN); + $data['train_info'] = $this->BIZ_train_model->get_biz_foi($info->COLD_SN); + $differtime = (strtotime($data['train_info'][0]->DepartureTime) - time()) / 3600; + $obj = $this->BIZ_train_model->get_biz_jol_info($info->COLD_SN,$jh_order); + $data['ordernumber'] = $obj->ts_elecnumber; + $status = $obj->ts_status; + $data['operator'] = $operator_info; + $data['emailarr'] = explode(';',$operator_info[0]->Email); + + $data['seatinfo'] = $obj->ts_seatsinfo; + + if($status == '4' && $differtime > 0){ + $subject = "Got payment and issued train ticket(s), Order No $coli_id"; + $body = $this->load->view('email',$data,true); + $this->send_mail_to_wl("订单:{$coli_id} 出票成功","翰特订单号:{$coli_id};聚合订单号:{$jh_order}",$coli_id); + //发送邮件给客人 + $flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); + $this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag)); + }else if($status == '1' && $differtime < 18 && $differtime > 0){ + $subject = "The train ticket(s) will be issued manually, Order No $coli_id"; + $body = $this->load->view('email_fault',$data,true); + $this->send_mail_to_wl("订单:{$coli_id} 出票失败","翰特订单号:{$coli_id};聚合订单号:{$jh_order}",$coli_id); + //测试阶段，将失败邮件发送一份给操作外联。 + $flag = $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$fromName,$fromEmail,$subject,$body); + //测试阶段，将失败邮件发送一份给操作外联。 + $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); + $this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>1,"ts_m_sn"=>$flag)); + }else{ + echo $jh_order.'不需要发邮件
      '; + $this->BIZ_train_model->update_biz_jol(array("ts_ordernumber"=>$jh_order),array("ts_sendmail"=>2)); + $flag = false; + } + + } + + //发邮件给外联 + function send_mail_to_wl($subject,$body,$coli_id){ + $fromName = "cyc"; + $fromEmail = "cyc@hainatravel.com"; + //获取该订单的操作员的邮箱以及姓名 + $info = $this->BIZ_train_model->get_operatorInfo($coli_id); + $toName = $info[0]->OPI_Name; + $toEmail = $info[0]->OPI_Email; + $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); + } + + //导出账单api + public function export_excel(){ + set_time_limit(0); + //创建跟踪号 + $trackcode = $this->BIZ_train_model->getTrackingCode(); + $from_date = $this->input->post("from_date"); + $to_date = $this->input->post("to_date"); + $examine = $this->input->post("examine"); + //$operator=$this->input->post("operator"); + + $reback=array();//返回的数据 + $reback["from_date"] = $from_date; + $reback["to_date"] = $to_date; + $reback["examine"] = $examine; + $group = array(); + + if(!empty($from_date) && !empty($to_date)){ + $from_date = date("Y-m-d H:i",strtotime($from_date)); + $to_date = date("Y-m-d H:i",strtotime($to_date)); + $r = "";//聚合返回的数据 + $string_r = "";//输出 + $coli_id = ""; + $wl_name = ""; + $arr = array();//整合完成的数组,写进excel表的数据 + $url = JUHE_TRAIN_EXPORT_API;//请求的url + $url .= "?key=".JUHE_TRAIN_API_KEY; + $url .= "&since=".$from_date; + $url .= "&before=".$to_date; + $r = GetPost_http($url); + $r = explode("\n",$r); + //print_r($r); + //die(); + for($i=1;$iBIZ_train_model->jh_order_get_coli_id($juhe_order); + //print_r($obj); + if(!empty($obj)){ + $coli_id = $obj[0]->COLI_ID; + $coli_sn = $obj[0]->COLI_SN; + }else{ + echo $juhe_order; + } + + $this->BIZ_train_model->linkTrackingCode($coli_sn,$trackcode); + + /*if(empty($coli_sn) || empty($coli_sn)){ + print_r($juhe_order); + }*/ + + + /* + $flag = $this->BIZ_train_model->islink($coli_sn); + if($flag){ + $this->BIZ_train_model->linkTrackingCode($coli_sn,$trackcode); + }else{ + echo $coli_sn.'该订单还未关联财务表，不能导出账单。
      '; + die(); + } + */ + //去掉数据两边的双引号 + $r_info[2]=substr($r_info[2], stripos($r_info[2],'"')+1,strrpos($r_info[2],'"')-1); + $r_info[1]=substr($r_info[1], stripos($r_info[1],'"')+1,strrpos($r_info[1],'"')-1); + $r_info[5]=substr($r_info[5], stripos($r_info[5],'"')+1,strrpos($r_info[5],'"')-1); + $r_info[6]="";//储存团名 + $r_info[7] = "";//储存外联名 + $r_info[8] = "";//储存coli_id + if($coli_id){ + $r_info[8] = $coli_id; + $gri_no=$this->BIZ_train_model->get_gri_no($r_info[8]);//团名 + $wl_name = $this->BIZ_train_model->get_operatorInfo($r_info[8]); + if($gri_no){ + $r_info[6] = $gri_no[0]->GRI_No; + } + if($wl_name){ + $r_info[7] = $wl_name[0]->OPI_Name; + } + } + + //$r_info[3]=mb_convert_encoding($r_info[3],"utf-8","gbk"); + + if(is_numeric(mb_strpos($r_info[3],"充值"))){ + if(is_numeric(mb_strpos($r_info[3],"扣款"))){ + $r_info[3]="票款(有充值)"; + } + if(is_numeric(mb_strpos($r_info[3],"扣手续费"))){ + $r_info[3]="手续费(有充值)"; + } + if(is_numeric(mb_strpos($r_info[3],"线上退票成功"))){ + $r_info[3]="退票费(有充值)"; + } + } + if(is_numeric(mb_strpos($r_info[3],"扣款"))){ + $r_info[3]="票款"; + } + if(is_numeric(mb_strpos($r_info[3],"扣手续费"))){ + $r_info[3]="手续费"; + } + if(is_numeric(mb_strpos($r_info[3],"线上退票成功"))){ + $r_info[3]="退票费"; + } + // $r_info[3]=mb_convert_encoding($r_info[3],"gbk","utf-8"); + $r_info['trackcode'] = $trackcode; + $arr[]=$r_info; + + /* + //根据外联的名字创建数组来存储对应外联的订单信息 + if(!empty($r_info[7])){ + if(!isset($group[$r_info[7]])){ + $group[$r_info[7]] = array(); + } + array_push($group[$r_info[7]],$r_info); + }*/ + + } + /* + //将存储好的分组重新循环出来。 + foreach($group as $item){ + foreach ($item as $value){ + array_push($arr,$value); + } + } + */ + //die(); + if(empty($examine)){ + header("Content-type:application/vnd.ms-excel;charset=utf-8"); + header("Content-Disposition:attachment;filename=juhe_train.xls"); + $string_r= $this->load->view("train_transaction_excel",array("arr"=>$arr),TRUE); + echo $string_r;die; + }else{ + krsort($arr);//数组倒序 + $reback["data"]=$arr; + } + + } + } + + //登录验证 + public function check_login(){ + $code = $this->input->get('code'); + $signature = getDingSignature(); + $urlencode_signature = urlencode($signature); + $personInfoUrl = 'https://oapi.dingtalk.com/sns/getuserinfo_bycode?signature='.$urlencode_signature.'×tamp='.time().'&accessKey=dingoaystremzlahfew1tb'; + $post_data = '{"tmp_auth_code":"'.$code.'"}'; + $returnJson = GetPost_http($personInfoUrl,$post_data,'json'); + $returnData = json_decode($returnJson); + + if(!empty($returnData->user_info)){ + //创建session + $this->session->set_userdata('dingname', $returnData->user_info->nick); + $this->session->set_userdata('dingunionid', $returnData->user_info->unionid); + redirect('http://www.mycht.cn/info.php/apps/trainsystem/pages/'); + }else{ + redirect('http://www.mycht.cn/info.php/apps/trainsystem/pages/login'); + } + } + + public function check_session(){ + print_r($this->session->userdata('dingunionid')); + } + + //订单同步到trainsystem + public function sync_orders(){ + die(); + //获取聚合订单 + $juhe_orders = $this->train_system_model->getallorders(); + + $add_data = new stdClass(); + foreach ($juhe_orders as $items){ + $add_data->ordernumber = $items->JOL_JuheOrder; + $add_data->cold_sn = $items->JOL_COLD_SN; + $add_data->status = $items->JOL_Status; + $add_data->returncode = ''; + $add_data->errormsg = $items->JOL_RebackMsg; + $add_data->checi = $items->JOL_TrainCode; + $add_data->fromstationame = $items->JOL_FromStation; + $add_data->fromstationcode = $items->JOL_FromStationCode; + $add_data->tostationame = $items->JOL_ToStation; + $add_data->tostationcode = $items->JOL_ToStationCode; + + $trains = json_decode($items->JOL_BackTxt); + //print_r($trains->passengers); + if(isset($trains->train_date)){ + $add_data->startdate = $trains->train_date; + }else{ + $add_data->startdate = ''; + } + + foreach ($trains->passengers as $passengers){ + //对订票乘客进行存储 + $data_passager->ordernumber = $items->JOL_JuheOrder; + $data_passager->realname = $passengers->passengersename; + $data_passager->identitytype = $passengers->passporttypeseidname; + $data_passager->numberid = $passengers->passportseno; + $data_passager->ticketype = $passengers->piaotypename; + $data_passager->ticketprice = $passengers->price; + $data_passager->seatype = $passengers->zwname; + $data_passager->seatdetail = $passengers->cxin; + $data_passager->status = $items->JOL_Status; + //print_r($data_passager); + $this->train_system_model->add_passagers($data_passager); + } + + $add_data->startime = ''; + $add_data->endtime = ''; + $add_data->runtime = ''; + + $add_data->channel = 'juhe'; + $add_data->isauto = $items->JOL_IsAuto; + $this->train_system_model->add_orders($add_data); + //print_r($add_data); + } + } + + public function update_order(){ + $juhe_orders = $this->train_system_model->getallorders(); + foreach ($juhe_orders as $tickets_info){ + $ordernumber = $tickets_info->JOL_JuheOrder; + $subtime = $tickets_info->JOL_SubTime; + $price = $tickets_info->JOL_Price; + $this->train_system_model->update_juheorder($ordernumber,$subtime,$price); + } + + } + +} \ No newline at end of file diff --git a/application/third_party/trainsystem/controllers/callback.php b/application/third_party/trainsystem/controllers/callback.php new file mode 100644 index 00000000..b6d36723 --- /dev/null +++ b/application/third_party/trainsystem/controllers/callback.php @@ -0,0 +1,320 @@ +load->helper('train'); + $this->load->model("train_system_model"); + $this->load->model("BIZ_train_model"); + } + + public function juhecallback(){ + $data_post = $this->input->post(); + if(empty($data_post)){ + header("HTTP/1.1 404 Not Found"); + exit('{"reason":"empty infos","status":"404"}'); + } + + //调试代码 + /*$test_post = '{"data":"{\"from_station_name\":\"\u6b66\u6c49\",\"from_station_code\":\"WHN\",\"to_station_name\":\"\u897f\u5b89\u5317\",\"to_station_code\":\"EAY\",\"train_date\":\"2019-04-13\",\"orderid\":\"JH155317715892154\",\"user_orderid\":\"488123754\",\"orderamount\":\"1363.50\",\"ordernumber\":\"E946949845\",\"checi\":\"G856\",\"msg\":\"\u51fa\u7968\u6210\u529f\",\"status\":\"4\",\"passengers\":[{\"passengerid\":1,\"passengersename\":\"VENOSLEONARDA\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"086925694\",\"price\":\"454.5\",\"zwcode\":\"O\",\"zwname\":\"\u4e8c\u7b49\u5ea7\",\"ticket_no\":\"E946949845102006A\",\"cxin\":\"02\u8f66\u53a2,06A\u5ea7\",\"reason\":0},{\"passengerid\":2,\"passengersename\":\"WAGENSTALLERSANDRA\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CF7NR17M7\",\"price\":\"454.5\",\"zwcode\":\"O\",\"zwname\":\"\u4e8c\u7b49\u5ea7\",\"ticket_no\":\"E946949845102006B\",\"cxin\":\"02\u8f66\u53a2,06B\u5ea7\",\"reason\":0},{\"passengerid\":3,\"passengersename\":\"WALDMANNSOPHIE\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CF26Y6FVK\",\"price\":\"454.5\",\"zwcode\":\"O\",\"zwname\":\"\u4e8c\u7b49\u5ea7\",\"ticket_no\":\"E946949845102006C\",\"cxin\":\"02\u8f66\u53a2,06C\u5ea7\",\"reason\":0}],\"refund_money\":null,\"sign\":\"f74013fa24115eeb9a807aa237054920\"}"}'; + + $data_post["data"] = json_decode($test_post)->data;*/ + + log_message('error','聚合回调：'.json_encode($data_post)); + $data = json_decode($data_post["data"]); + + $update_data = new StdClass(); + $update_data->OrderStatus = $data->status; + $update_data->ordernumber = $data->orderid; + $update_data->OrderTotleFee = $data->orderamount; + $update_data->seatsinfo = ''; + $update_data->TicketCheck = ''; + $update_data->bookcallback = ''; + $update_data->confirmcallback = ''; + $update_data->returncallback = ''; + $update_data->ElectronicOrderNumber = $data->ordernumber; + $update_data->reschedulecallback = ''; + $update_data->ErrorMsg = $data->msg; + + //如果返回2则发送出票请求 + if($data->status == "1"){ + $update_data->bookcallback = $data_post["data"]; + }elseif($data->status == "2"){ + $coach = array(); + $seats = array(); + $string = ''; + $passagers = $data->passengers; + foreach($passagers as $item){ + foreach(explode(',',$item->cxin) as $item_seat){ + if(strpos($item_seat,'车厢')){ + $item_seat = str_replace('车厢','',$item_seat); + array_push($coach,$item_seat); + }else{ + $find = array('座上铺','座中铺','座下铺','座'); + $replace = array(' upper',' middle',' lower',''); + $item_seat = str_replace($find,$replace,$item_seat); + array_push($seats,$item_seat); + } + } + + //对订票乘客进行存储 + $data_passager->ordernumber = $data->orderid; + $data_passager->realname = $item->passengersename; + $data_passager->identitytype = $item->passporttypeseidname; + $data_passager->numberid = $item->passportseno; + $data_passager->ticketype = $item->piaotypename; + $data_passager->ticketprice = $item->price; + $data_passager->seatype = $item->zwname; + $data_passager->seatdetail = $item->cxin; + $data_passager->status = '4'; + $this->train_system_model->add_passagers($data_passager); + } + + //判断车厢是否唯一，如果不唯一的话，分成两个车厢 + if(count(array_unique($coach)) == 1){ + $onlycoach = array_unique($coach); + $string .= 'Coach '.$onlycoach[0].','; + }else{ + foreach (array_unique($coach) as $item_coach){ + $string .= 'Coach '.$item_coach.','; + } + } + + $string .= 'Seat '; + foreach($seats as $item_seat){ + $string .= $item_seat.','; + } + + $seatinfo = substr($string,0,strlen($string)-1); + $update_data->seatsinfo = $seatinfo; + + $post_data = array( + "key"=>JUHE_TRAIN_API_KEY, + "orderid"=>$data->orderid + ); + $back_json = GetPost_http(JUHE_TRAIN_PAY_API,$post_data); + $update_data->bookcallback = $data_post["data"]; + }elseif($data->status == "4"){ + $add_train_order_data->TOC_Memo = $data->orderid." 聚合出票"; + $add_train_order_data->TOC_COLD_SN = $data->user_orderid; + $add_train_order_data->TOC_TrainNumber = $data->checi; + $add_train_order_data->TOC_DepartureDate = $data->train_date; + $add_train_order_data->TOC_TicketCost = $data->orderamount; + $add_train_order_data->poundage = (count($data->passengers)*2)."";//手续费，每人两块，转换成字符串 + $add_train_order_data->FOI_TrainNetOrderNo = $data->ordernumber; + $this->BIZ_train_model->add_train_payment($add_train_order_data); + + $update_data->confirmcallback = $data_post["data"]; + $this->BIZ_train_model->update_cold_planvei_sn($data->user_orderid); + }elseif($data->status=="7"){ + //退票成功 写入TOC表 + $newtime = "";//记录最新操作时间 + $refund_passportseno = "";//退票人护照号 + $refund_money = "";//退票金额 + foreach ($data->passengers as $p) { + if(isset($p->returntickets)){ + $refund_passportseno = $p->refundTimeline[count($p->refundTimeline)-1]->detail->passportseno; + $refund_money = $p->refundTimeline[count($p->refundTimeline)-1]->detail->returnmoney; + //退票时还需要单独对对每个乘客存储回调信息 + $passpager_info = new stdClass(); + $passpager_info->returncallback = $data_post["data"]; + $passpager_info->status = '7'; + $passpager_info->ordernumber = $data->orderid; + $passpager_info->realname = $p->refundTimeline[count($p->refundTimeline)-1]->detail->passengername; + $passpager_info->numberid = $refund_passportseno; + print_r($passpager_info); + $this->train_system_model->update_passpager_info($passpager_info); + + //添加退款记录 + $add_train_order_data->TOC_COLD_SN = $data->user_orderid; + $add_train_order_data->TOC_Memo = $data->orderid." ".$refund_passportseno; + $add_train_order_data->ordernumber = $data->user_orderid; + $add_train_order_data->TOC_TrainNumber = $data->checi; + $add_train_order_data->TOC_DepartureDate = $data->train_date; + $add_train_order_data->TOC_TicketCost = -$refund_money; + $add_train_order_data->FOI_TrainNetOrderNo = null;//退票不用更新取票号，以此在模型里面判断是否为退票消息 + + $this->BIZ_train_model->add_train_payment($add_train_order_data); + }else{ + //有可能提交了退票或者还没有退票 + + } + } + + $update_data->returncallback = $data_post["data"]; + } + //print_r($update_data);die(); + //更新订单信息(出票系统) + $this->train_system_model->update_orders($update_data); + } + + public function ctripcallback(){ + $back_json = file_get_contents('php://input'); + log_message('error','携程回调信息：'.$back_json); + /*$back_json = '{"Authentication":{"ServiceName":"web.order.returnTicketNotice","PartnerName":"tieyou","TimeStamp":"2019-1-18 11:35:22","MessageIdentity":"93F2BA3253829E8FAD29B5DEB7646A59"},"TrainOrderService":{"contactName":{},"contactMobile":{},"OrderNumber":"guilintravel1547778269","refundTicket":{"childBillId":{},"orderId":"8360041214","eOrderNumber":"EB59937931","eOrderType":"1","seatNumber":"01D\u53f7","passport":"544712454","passportName":"YANGFRANCISCHENG","realName":"YANGFRANCISCHENG","status":"1","reason":"\u9000\u7968\u6210\u529f\uff0c\u9000\u6b3e\u91d1\u989d:218.50\u5143"}}}';*/ + $ctrip_backdata = json_decode($back_json); + //print_r($ctrip_backdata); + if(!empty($ctrip_backdata)){ + $update_data = new stdClass(); + $update_data->ServiceName = $ctrip_backdata->Authentication->ServiceName; + $update_data->ordernumber = ''; + $update_data->seatsinfo = ''; + $update_data->TicketCheck = ''; + $update_data->bookcallback = ''; + $update_data->confirmcallback = ''; + $update_data->returncallback = ''; + $update_data->OrderTotleFee = 0; + $update_data->ElectronicOrderNumber = ''; + $update_data->reschedulecallback = ''; + + if($update_data->ServiceName == 'web.order.notifyTicket'){ + $update_data->OrderStatus = '4'; + $update_data->ErrorMsg = '出票成功'; + $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; + $update_data->OrderTotleFee = $ctrip_backdata->TrainOrderService->OrderInfo->OrderTotleFee; + $update_data->ElectronicOrderNumber = $ctrip_backdata->TrainOrderService->OrderInfo->ElectronicOrderNumber; + + //新添加检票口信息 + if(isset($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->TicketCheck)){ + if(!is_object($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->TicketCheck)){ + $update_data->TicketCheck = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->TicketCheck; + } + } + + //获取总票数，由于携程接口单人和多人返回的数据结构不一致 + $person_num = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->TicketCount; + + //存储座位信息 转换为英文 + $coach_arr = array(); + $seats_arr = array(); + $data_passager = new stdClass(); + $string = ''; + $i = 0; + if($person_num > 1){ + foreach ($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo as $items){ + if(strpos($items->SeatNo,'车厢')){ + $coach = mb_substr($items->SeatNo,0,strpos($items->SeatNo,'车厢')); + array_push($coach_arr,$coach); + $seat = mb_substr($items->SeatNo,strpos($items->SeatNo,'车厢')+2,mb_strlen($items->SeatNo,'UTF8')); + $find = array('号'); + $replace = array(''); + $seat = str_replace($find,$replace,$seat); + array_push($seats_arr,$seat); + } + + //对订票乘客进行存储 + $data_passager->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; + $data_passager->realname = $items->PassengerName; + $data_passager->identitytype = $items->IdentityType; + $data_passager->numberid = $items->NumberID; + $data_passager->ticketype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->TicketType; + $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; + $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; + $data_passager->seatdetail = $items->SeatNo; + $this->train_system_model->add_passagers($data_passager); + $i++; + } + + }else{ + $seatinfo_html = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->SeatNo; + if(strpos($seatinfo_html,'车厢')){ + $coach = mb_substr($seatinfo_html,0,strpos($seatinfo_html,'车厢')); + array_push($coach_arr,$coach); + $seat = mb_substr($seatinfo_html,strpos($seatinfo_html,'车厢')+2,mb_strlen($seatinfo_html,'UTF8')); + $find = array('号'); + $replace = array(''); + $seat = str_replace($find,$replace,$seat); + array_push($seats_arr,$seat); + } + + //对订票乘客进行存储 + $data_passager->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; + $data_passager->realname = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->PassengerName; + $data_passager->identitytype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->IdentityType; + $data_passager->numberid = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->NumberID; + $data_passager->ticketype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->TicketType; + $data_passager->ticketprice = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketPrice; + $data_passager->seatype = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->OrderTicketSeat; + $data_passager->seatdetail = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfoFinal->Tickets->Ticket->DetailInfos->DetailInfo->SeatNo; + $this->train_system_model->add_passagers($data_passager); + } + + if(count(array_unique($coach_arr)) == 1){ + $onlycoach = array_unique($coach_arr); + $update_data->seatsinfo .= 'Coach '.$onlycoach[0].','; + }else{ + foreach (array_unique($coach_arr) as $item_coach){ + $update_data->seatsinfo .= 'Coach '.$item_coach.','; + } + } + + $update_data->seatsinfo .= 'Seat '; + foreach($seats_arr as $item_seat){ + $update_data->seatsinfo .= $item_seat.','; + } + + $update_data->seatsinfo = substr($update_data->seatsinfo,0,strlen($update_data->seatsinfo)-1); + + $update_data->bookcallback = $back_json; + + //添加支付记录 + $add_train_payment_data->TOC_Memo = $update_data->ordernumber; + //根据订单号获取cold_sn + $order_info = $this->train_system_model->get_order_info($update_data->ordernumber); + $cold_sn = $order_info->ts_cold_sn; + $add_train_payment_data->TOC_COLD_SN = $cold_sn; + $add_train_payment_data->TOC_TrainNumber = $ctrip_backdata->TrainOrderService->OrderInfo->TicketInfo->OrderTicketCheci; + $add_train_payment_data->TOC_DepartureDate = date('Y-m-d',strtotime($ctrip_backdata->TrainOrderService->OrderInfo->TicketInfo->OrderTicketYMD)); + $add_train_payment_data->TOC_TicketCost = $update_data->OrderTotleFee; + $add_train_payment_data->poundage = ($person_num*5)."";//手续费，每人五块，转换成字符串 + $add_train_payment_data->FOI_TrainNetOrderNo = $update_data->ElectronicOrderNumber; + //print_r($add_train_order_data);die(); + $this->BIZ_train_model->add_train_payment($add_train_payment_data); + //记录供应商(瀚特) + $this->BIZ_train_model->update_cold_planvei_sn($cold_sn); + }else if($update_data->ServiceName == 'web.order.notifyNoTicket'){ + $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; + $update_data->OrderStatus = '1'; + $update_data->ErrorMsg = $ctrip_backdata->TrainOrderService->OrderInfo->NoTicketReasons; + $update_data->confirmcallback = $back_json; + }else if($update_data->ServiceName == 'web.order.returnTicketNotice'){ + $update_data->ordernumber = $ctrip_backdata->TrainOrderService->OrderNumber; + $update_data->OrderStatus = '7'; + $update_data->ErrorMsg = $ctrip_backdata->TrainOrderService->refundTicket->reason; + $update_data->returncallback = $back_json; + + //退票时还需要单独对对每个乘客存储回调信息 + $passpager_info = new stdClass(); + $passpager_info->returncallback = $back_json; + $passpager_info->status = '7'; + $passpager_info->ordernumber = $ctrip_backdata->TrainOrderService->OrderNumber; + $passpager_info->realname = $ctrip_backdata->TrainOrderService->refundTicket->realName; + $passpager_info->numberid = $ctrip_backdata->TrainOrderService->refundTicket->passport; + $this->train_system_model->update_passpager_info($passpager_info); + }else if($update_data->ServiceName == 'web.order.requestRefund'){ + $return_order = $ctrip_backdata->TrainOrderService->OrderInfo->OrderNumber; + $return_money = $ctrip_backdata->TrainOrderService->TotalRefundAmount; + + //根据订单号获取cold_sn + $order_info = $this->train_system_model->get_order_info($return_order); + $cold_sn = $order_info->ts_cold_sn; + //print_r($order_info); + + $add_train_payment_data->TOC_Memo = $return_order.'_'.$ctrip_backdata->TrainOrderService->OrderInfo->OrderTid; + $add_train_payment_data->TOC_COLD_SN = $cold_sn; + $add_train_payment_data->TOC_TrainNumber = $order_info->ts_checi; + $add_train_payment_data->TOC_DepartureDate = $order_info->ts_startdate; + $add_train_payment_data->TOC_TicketCost = -$ctrip_backdata->TrainOrderService->TotalRefundAmount; + $add_train_payment_data->FOI_TrainNetOrderNo=null; + //print_r($add_train_payment_data);die(); + $this->BIZ_train_model->add_train_payment($add_train_payment_data); + return false; + } + + //更新订单信息(出票系统) + $this->train_system_model->update_orders($update_data); + } + } +} \ No newline at end of file diff --git a/application/third_party/trainsystem/controllers/check.php b/application/third_party/trainsystem/controllers/check.php new file mode 100644 index 00000000..0344df4d --- /dev/null +++ b/application/third_party/trainsystem/controllers/check.php @@ -0,0 +1,528 @@ +load->model("BIZ_train_model"); + $this->load->model("train_system_model"); + $this->load->helper('train'); + $this->db_train_zw = $this->config->item('db_train_zw'); + $this->train_zw = $this->config->item('train_zw'); + $this->black_list = $this->config->item('black_list'); + $this->isauto = 0; + } + + public function index(){ + //$this->BIZ_train_model->delete_other(); + } + + //1903241050 + public function check_autotickets(){ + log_message('error','auto ticket'); + date_default_timezone_set('Asia/Shanghai'); + //判断账户余额，如果小于1000自动退出。 + $post_data = array("key"=>JUHE_TRAIN_API_KEY); + $back_data = GetPost_http("http://op.juhe.cn/trainTickets/balance.php",$post_data); + $price = json_decode($back_data)->result; + print_r('账户余额：'.$price); + if($price < 1000){ + exit('账户余额不足'); + } + //筛选出能自动出票的订单 + $auto_pool = $this->BIZ_train_model->auto_check_ticket(); + + //创建一个不允许自动出票的国际火车票数组 + $nation_train = array('K19', 'K23', 'Z8701', 'Z8702', 'Z97', 'Z98', 'Z99', 'Z100', 'K9795'); + + //创建黑名单 + $black_list = $this->config->item('black_list'); + $string = ''; + + foreach($auto_pool as $item){ + $this->isauto = 1; + $bpe_sn = ''; + $back_message = ''; + $cold_sn = $item->COLD_SN; + $coli_id = $item->coli_id; + $back_data = 1; + + $people_arr = $this->BIZ_train_model->biz_people($cold_sn); + $train_info = $this->BIZ_train_model->get_biz_foi($cold_sn); + + if($item->COLD_SPFS > 1){ + //寄送票 + $back_data = 0; + $back_message .= '-邮寄不自动出票'; + } + + //乘客人数大于5人不出票 + if(count($people_arr) > 5){ + $back_data = 0; + $back_message .= '-乘客人数大于5不自动出票'; + } + + //护照号如果在黑名单的就不自动出票 + foreach($people_arr as $people_info){ + if(in_array($people_info->BPE_Passport,$black_list)){ + $back_data = 0; + $back_message .= '-此用户为黑名单用户，不自动出票'; + } + + if(strlen($people_info->BPE_Passport) >= 18){ + $back_data = 0; + $back_message .= '-护照位数大于18不自动出票'; + } + + $bpe_sn .= $people_info->BPE_SN.','; + } + $bpe_sn = substr($bpe_sn,0,strlen($bpe_sn)-1); + + //单张票价不能大于1000人民币 + if($train_info[0]->adultcost > 1000){ + $back_data = 0; + $back_message .= '-单价大于1000不自动出票'; + } + + //如果为国际火车票就不出票 + if(in_array($train_info[0]->FlightsNo, $nation_train)){ + $back_data = 0; + $back_message .= '-国际火车票不自动出票'; + } + + //无座的订单不做出票 + if($train_info[0]->Aircraft == 'WZ'){ + $back_data = 0; + $back_message .= '-无座不自动出票'; + } + + //香港火车不自动出票 + if($train_info[0]->DepartAirport == 'XJA'){ + $back_data = 0; + $back_message .= '-香港火车不自动出票'; + } + + $DepartureDate = strtotime($train_info[0]->DepartureDate); + $time = time(); + $depart_diff = ($DepartureDate - $time) / 86400; + + if($train_info[0]->ArrivalAirport == 'XJA' && $train_info[0]->adultcost > 500 && $depart_diff > 5){ + $back_data = 0; + $back_message .= '-内地香港火车金额大于500超过五天不自动出票'; + } + //print_r($train_info); + + //如果刚好是第三十天的订单 + if(($item->COLI_State == '8' || $item->COLI_State == '63')){ + $this->isauto = 3; + $time_obj = $this->BIZ_train_model->get_saletime($train_info['0']->DepartAirport_cn); + if(!empty($time_obj)){ + $saletime = strtotime(date('Y-m-d').' '.$time_obj->TST_saletime); + //echo $saletime; + $sale_diff = (time() - $saletime) / 3600; + echo $cold_sn.'_'.date('Y-m-d').' '.$time_obj->TST_saletime.'/'.$saletime.'
      '; + if($sale_diff > 1){ + $back_data = 0; + $back_message .= '-超过抢票时间'; + }else if($sale_diff <0){ + $back_data = 0; + $back_message .= '-未到抢票时间'; + } + } + } + + if($back_data == 0){ + $string .= '汉特订单号：'.$coli_id.'('.$cold_sn.'/'.$this->isauto.')'.$back_message.''; + }else{ + //单个订单提交 + echo $cold_sn.'
      '; + //$this->booktickets($cold_sn,$bpe_sn,'','juhe'); + //$string .= '汉特订单号：'.$coli_id.'('.$cold_sn.')可以自动出票'; + } + } + print_r(''.$string.'
      '); + } + + //创建一个方法用于接收所有的出票请求 + public function booktickets($cold_sn=null,$bpe_sn=null,$selectseat=null,$type=null){ + if(empty($cold_sn) && empty($bpe_sn)){ + //接收子表订单号 + $cold_sn = $this->input->get_post('order'); + //接收客人表sn + $bpe_sn = $this->input->get_post("people"); + //接收选座字符串 + $selectseat = $this->input->get_post("selectseat"); + //接收出票接口 + $type = $this->input->get_post("type"); + } + //测试数据 + /*$cold_sn = '488121613'; + $bpe_sn = '473183645,473183646,473183647'; + $selectseat = ''; + $type = 'juhe';*/ + + if(!is_numeric($cold_sn)){ + $reback["mes"]="订单号是数字"; + echo json_encode($reback); + return false; + } + + if(empty($bpe_sn)){ + $reback["mes"]="请选择乘客"; + echo json_encode($reback); + return false; + } + + $data['train'] = $this->BIZ_train_model->biz_order_detail($cold_sn); + $data['people_list']=$this->BIZ_train_model->in_bpesn_people_info($bpe_sn); + + if($selectseat == ''){ + $selectseat = ''; + $train_select = $data['train']->FOI_SelectedSeat; + $obj = explode(',',$train_select); + foreach($obj as $value){ + $selectseat .= $value; + } + } + + if (empty($data['train'])) { + //显示错误,找不到车次 + $reback["mes"]="找不到车次"; + echo json_encode($reback); + return false; + } + + if (empty($data['people_list'])) { + //显示错误，找不到用户信息 + $reback["mes"]="找不到乘客信息"; + echo json_encode($reback); + return false; + } + + if (count($data['people_list']) > 5) { + //显示错误，用户超过五个 + $reback["mes"]="乘客不能超过五个"; + echo json_encode($reback); + return false; + } + + switch ($type){ + case 'juhe': + $this->juheModel($data,$selectseat,$cold_sn); + break; + case 'tuniu': + $this->tuniuModel($data,$selectseat,$cold_sn); + break; + case 'ctrip': + $this->ctripModel($data,$selectseat,$cold_sn); + break; + } + } + + function juheModel($data=null,$selectseat=null,$cold_sn=null){ + $zwcode = $this->db_train_zw[$data['train']->Aircraft]; //座位简码 + $zwname = $this->train_zw[$this->db_train_zw[$data['train']->Aircraft]]; //座位名称 + + //进行提交字符串的拼接 + $passengers = ""; + foreach ($data['people_list'] as $key => $item) { + //乘客姓名 + $passengersename = $item->BPE_FirstName.$item->BPE_MiddleName.$item->BPE_LastName; + //将特殊字符转换为正常字符以便于出票 + $passengersename = chk_sp_name($passengersename); + //乘客类型 + switch ($item->BPE_GuestType) { + case 1: + $piaotype = 1; + $piaotypename = "成人票"; + break; + case 2: + $piaotype = 2; + $piaotypename = "儿童票"; + break; + default://外国人应该就两种票吧 + $piaotype = 1; + $piaotypename = "成人票"; + break; + } + + //证件类型 + switch ($item->BPE_PassportType){ + case 'Chinese ID': + $passporttypeseid = "1"; + $passporttypeseidname = "二代身份证"; + break; + case 'Travel Permit from Hong Kong / Macau': + $passporttypeseid = "C"; + $passporttypeseidname = "港澳通行证"; + break; + case 'Travel Permit from Taiwan': + $passporttypeseid = "G"; + $passporttypeseidname = "台湾通行证"; + break; + default : + $passporttypeseid = "B"; + $passporttypeseidname = "护照"; + break; + } + + switch ($item->BPE_SEX){ + case '100003': + $sex = 'F'; + break; + case '100001': + $sex = 'M'; + break; + } + + $passportseno = str_replace(' ','',$item->BPE_Passport); + + //添加一个判断护照号是否在黑名单 + if(in_array($passportseno,$this->black_list)){ + $reback["mes"] = "乘客为黑名单用户"; + echo json_encode($reback); + return false; + } + + if($passporttypeseid == 'G'){ + $passengers .= ',{"passengerid":' . (++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"1","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '","gatValidDateEnd":"'.$item->BPE_PassExpdate.'","gatBornDate":"'.$item->BPE_BirthDate.'","sexCode":"'.$sex.'"}'; + }else{ + $passengers .= ',{"passengerid":' . ( ++$key) . ',"passengersename":"' . $passengersename . '","piaotype":"' . $piaotype . '","piaotypename":"' . $piaotypename . '","passporttypeseid":"' . $passporttypeseid . '","passporttypeseidname":"' . $passporttypeseidname . '","passportseno":"' . $passportseno . '","price":"1","zwcode":"' . $zwcode . '","zwname":"' . $zwname . '"}'; + } + + } + + $passengers .= "]"; + $passengers = substr($passengers, 1); + $passengers = "[" . $passengers; + if(empty($selectseat)){ + $post_data=array( + "key"=>JUHE_TRAIN_API_KEY, + "user_orderid"=>$cold_sn,//自定义订单号 + "train_date"=>substr($data["train"]->DepartureDate, 0, 10), + "is_accept_standing"=>"no", + "from_station_name"=>$data["train"]->DepartAirport_cn, + "from_station_code"=>$data["train"]->DepartAirport, + "to_station_code"=>$data["train"]->ArrivalAirport, + "to_station_name"=>$data["train"]->ArrivalAirport_cn, + "passengers"=>$passengers, + "checi"=>$data["train"]->FlightsNo + ); + }else{ + $post_data=array( + "key"=>JUHE_TRAIN_API_KEY, + "user_orderid"=>$cold_sn,//自定义订单号 + "train_date"=>substr($data["train"]->DepartureDate, 0, 10), + "is_accept_standing"=>"no", + "choose_seats"=>$selectseat, + "from_station_name"=>$data["train"]->DepartAirport_cn, + "from_station_code"=>$data["train"]->DepartAirport, + "to_station_code"=>$data["train"]->ArrivalAirport, + "to_station_name"=>$data["train"]->ArrivalAirport_cn, + "passengers"=>$passengers, + "checi"=>$data["train"]->FlightsNo + ); + } + + //发起请求 + /*$add_data = new stdClass(); + $back_json = GetPost_http('http://op.juhe.cn/trainTickets/submit',$post_data); + $back_data = json_decode($back_json); + + if(!$back_data->error_code){ + $add_data->ordernumber = $back_data->result->orderid; + $reback["status"] = 1; + $reback["order"] = $back_data->result->orderid; + $reback["mes"] = "订单提交成功，等待回调"; + }else{ + $add_data->ordernumber=null; + $reback["mes"] = $back_json; + $add_data->status = "e"; + }*/ + + //本地订单入库 + $add_data->cold_sn = $cold_sn; + $add_data->returncode = $back_data->error_code; + $add_data->status = '2'; + $add_data->errormsg = '预定中'; + $add_data->checi = $data['train']->FlightsNo; + $add_data->fromstationame = $data['train']->DepartAirport_cn; + $add_data->fromstationcode = $data['train']->DepartAirport; + $add_data->tostationame = $data['train']->ArrivalAirport_cn; + $add_data->tostationcode = $data['train']->ArrivalAirport; + $add_data->startdate = date('Y-m-d',strtotime($data['train']->DepartureDate)); + $add_data->startime = date('H:i',strtotime($data['train']->DepartureTime)); + $add_data->endtime = date('H:i',strtotime($data['train']->ArrivalTime)); + $add_data->runtime = (strtotime($data['train']->ArrivalTime) - strtotime($data['train']->DepartureTime)) / 60; + $add_data->channel = 'juhe'; + $add_data->isauto = $this->isauto; + print_r($add_data); + /*$this->train_system_model->add_orders($add_data); + echo json_encode($reback); + return false;*/ + + } + + public function test_add(){ + $add_data->cold_sn = '123123'; + $add_data->returncode = '123123'; + $add_data->status = '2'; + $add_data->errormsg = '预定中'; + $add_data->checi = 'G89'; + $add_data->fromstationame = '北京'; + $add_data->fromstationcode = 'BJP'; + $add_data->tostationame = '上海'; + $add_data->tostationcode = 'SHH'; + $add_data->startdate = '2019-02-09'; + $add_data->startime = '14:00'; + $add_data->endtime = '19:00'; + $add_data->runtime = '300'; + $add_data->channel = 'juhe'; + $add_data->isauto = 3; + print_r($add_data); + $this->train_system_model->add_orders($add_data); + } + + public function juhecallback(){ + /*$data_post = $this->input->post(); + if(empty($data_post)){ + header("HTTP/1.1 404 Not Found"); + exit('{"reason":"empty infos","status":"404"}'); + }*/ + + //调试代码 + $test_post = '{"data":"{\"from_station_name\":\"\u5317\u4eac\u5357\",\"from_station_code\":\"VNP\",\"to_station_name\":\"\u4e0a\u6d77\u8679\u6865\",\"to_station_code\":\"AOH\",\"train_date\":\"2019-05-08\",\"orderid\":\"JH155489661120411\",\"user_orderid\":\"488128168\",\"orderamount\":\"3496.00\",\"ordernumber\":\"EE79032518\",\"checi\":\"G43\",\"msg\":\"\u7ebf\u4e0a\u9000\u7968\u6210\u529f\",\"status\":\"7\",\"passengers\":[{\"passengerid\":1,\"passengersename\":\"WEISIGKOLIVER\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CAYLW9WTT\",\"price\":\"1748.0\",\"zwcode\":\"9\",\"zwname\":\"\u5546\u52a1\u5ea7\",\"ticket_no\":\"EE79032518103005A\",\"cxin\":\"03\u8f66\u53a2,05A\u5ea7\",\"reason\":0,\"refundTimeline\":[{\"time\":\"2019-04-11 11:46:10\",\"msg\":\"\u7ebf\u4e0a\u7533\u8bf7\u9000\u7968\"},{\"time\":\"2019-04-11 11:46:41\",\"msg\":\"\u7ebf\u4e0a\u9000\u7968\u6210\u529f\",\"detail\":{\"returnsuccess\":true,\"returnmoney\":\"1748\",\"returnfailid\":\"\",\"returnfailmsg\":\"\",\"returntype\":\"1\",\"ticket_no\":\"EE79032518103005A\",\"passengername\":\"WEISIGKOLIVER\",\"passporttypeseid\":\"B\",\"passportseno\":\"CAYLW9WTT\"}}],\"returntickets\":{\"returnsuccess\":true,\"returnmoney\":\"1748\",\"returntime\":\"2019-04-11 11:46:39\",\"returnfailid\":\"\",\"returnfailmsg\":\"\",\"returntype\":\"1\"}},{\"passengerid\":2,\"passengersename\":\"ALBERTSTEFANIECAROLINDOROTHEE\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CAYLM2751\",\"price\":\"1748.0\",\"zwcode\":\"9\",\"zwname\":\"\u5546\u52a1\u5ea7\",\"ticket_no\":\"EE79032518103005C\",\"cxin\":\"03\u8f66\u53a2,05C\u5ea7\",\"reason\":0,\"refundTimeline\":[{\"time\":\"2019-04-11 11:46:12\",\"msg\":\"\u7ebf\u4e0a\u7533\u8bf7\u9000\u7968\"}]}],\"refund_money\":\"1748.00\",\"sign\":\"f077215579ecd5c130d39b502c9bd055\"}"}'; + + $data_post["data"] = json_decode($test_post)->data; + + log_message('error','聚合回调：'.json_encode($data_post)); + $data = json_decode($data_post["data"]); + + $update_data = new StdClass(); + $update_data->OrderStatus = $data->status; + $update_data->ordernumber = $data->orderid; + $update_data->OrderTotleFee = $data->orderamount; + $update_data->seatsinfo = ''; + $update_data->TicketCheck = ''; + $update_data->bookcallback = ''; + $update_data->confirmcallback = ''; + $update_data->returncallback = ''; + $update_data->ElectronicOrderNumber = $data->ordernumber; + $update_data->reschedulecallback = ''; + $update_data->ErrorMsg = $data->msg; + + //如果返回2则发送出票请求 + if($data->status == "1"){ + $update_data->bookcallback = $data_post["data"]; + }elseif($data->status == "2"){ + $coach = array(); + $seats = array(); + $string = ''; + $passagers = $data->passengers; + foreach($passagers as $item){ + foreach(explode(',',$item->cxin) as $item_seat){ + if(strpos($item_seat,'车厢')){ + $item_seat = str_replace('车厢','',$item_seat); + array_push($coach,$item_seat); + }else{ + $find = array('座上铺','座中铺','座下铺','座'); + $replace = array(' upper',' middle',' lower',''); + $item_seat = str_replace($find,$replace,$item_seat); + array_push($seats,$item_seat); + } + } + + //对订票乘客进行存储 + $data_passager->ordernumber = $data->orderid; + $data_passager->realname = $item->passengersename; + $data_passager->identitytype = $item->passporttypeseidname; + $data_passager->numberid = $item->passportseno; + $data_passager->ticketype = $item->piaotypename; + $data_passager->ticketprice = $item->price; + $data_passager->seatype = $item->zwname; + $data_passager->seatdetail = $item->cxin; + $data_passager->status = '4'; + $this->train_system_model->add_passagers($data_passager); + } + + //判断车厢是否唯一，如果不唯一的话，分成两个车厢 + if(count(array_unique($coach)) == 1){ + $onlycoach = array_unique($coach); + $string .= 'Coach '.$onlycoach[0].','; + }else{ + foreach (array_unique($coach) as $item_coach){ + $string .= 'Coach '.$item_coach.','; + } + } + + $string .= 'Seat '; + foreach($seats as $item_seat){ + $string .= $item_seat.','; + } + + $seatinfo = substr($string,0,strlen($string)-1); + $update_data->seatsinfo = $seatinfo; + + $post_data = array( + "key"=>JUHE_TRAIN_API_KEY, + "orderid"=>$data->orderid + ); + $back_json = GetPost_http(JUHE_TRAIN_PAY_API,$post_data); + $update_data->bookcallback = $data_post["data"]; + }elseif($data->status == "4"){ + $add_train_order_data->TOC_Memo = $data->orderid." 聚合出票"; + $add_train_order_data->TOC_COLD_SN = $data->user_orderid; + $add_train_order_data->TOC_TrainNumber = $data->checi; + $add_train_order_data->TOC_DepartureDate = $data->train_date; + $add_train_order_data->TOC_TicketCost = $data->orderamount; + $add_train_order_data->poundage = (count($data->passengers)*2)."";//手续费，每人两块，转换成字符串 + $add_train_order_data->FOI_TrainNetOrderNo = $data->ordernumber; + $this->BIZ_train_model->add_train_payment($add_train_order_data); + + $update_data->confirmcallback = $data_post["data"]; + $this->BIZ_train_model->update_cold_planvei_sn($data->user_orderid); + }elseif($data->status=="7"){ + //退票成功 写入TOC表 + $newtime = "";//记录最新操作时间 + $refund_passportseno = "";//退票人护照号 + $refund_money = "";//退票金额 + foreach ($data->passengers as $p) { + if(isset($p->returntickets)){ + $refund_passportseno = $p->refundTimeline[count($p->refundTimeline)-1]->detail->passportseno; + $refund_money = $p->refundTimeline[count($p->refundTimeline)-1]->detail->returnmoney; + //退票时还需要单独对对每个乘客存储回调信息 + $passpager_info = new stdClass(); + $passpager_info->returncallback = $data_post["data"]; + $passpager_info->status = '7'; + $passpager_info->ordernumber = $data->orderid; + $passpager_info->realname = $p->refundTimeline[count($p->refundTimeline)-1]->detail->passengername; + $passpager_info->numberid = $refund_passportseno; + print_r($passpager_info); + $this->train_system_model->update_passpager_info($passpager_info); + + //添加退款记录 + $add_train_order_data->TOC_COLD_SN = $data->user_orderid; + $add_train_order_data->TOC_Memo = $data->orderid." ".$refund_passportseno; + $add_train_order_data->ordernumber = $data->user_orderid; + $add_train_order_data->TOC_TrainNumber = $data->checi; + $add_train_order_data->TOC_DepartureDate = $data->train_date; + $add_train_order_data->TOC_TicketCost = -$refund_money; + $add_train_order_data->FOI_TrainNetOrderNo = null;//退票不用更新取票号，以此在模型里面判断是否为退票消息 + + $this->BIZ_train_model->add_train_payment($add_train_order_data); + }else{ + //有可能提交了退票或者还没有退票 + + } + } + + $update_data->returncallback = $data_post["data"]; + } + //print_r($update_data);die(); + //更新订单信息(出票系统) + $this->train_system_model->update_orders($update_data); + } + +} \ No newline at end of file diff --git a/application/third_party/trainsystem/controllers/orders.php b/application/third_party/trainsystem/controllers/orders.php new file mode 100644 index 00000000..51cde718 --- /dev/null +++ b/application/third_party/trainsystem/controllers/orders.php @@ -0,0 +1,18 @@ +load->model("train_system_model"); + $this->load->model("BIZ_train_model"); + $this->load->helper('train'); + $this->order_status_msg = $this->config->item('train_order_status_msg'); + } + + public function index($coli_id = null){ + if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + dingLogin(); + } + if($coli_id == null){ + $cols_id = $this->input->post("ht_order"); + }else{ + $cols_id = $coli_id; + } + + $list=new StdClass; + if(!empty($cols_id)){ + $cold_sn = $this->BIZ_train_model->get_biz_cold($cols_id); + $list->wl = $this->BIZ_train_model->get_operatorInfo($cols_id); + $i=0; + $list->info=array(); + foreach ($cold_sn as $v) { + $list->info[$i] = new StdClass; + $list->info[$i]->people = $this->BIZ_train_model->biz_people($v->COLD_SN); + $list->info[$i]->train = $this->BIZ_train_model->get_biz_foi($v->COLD_SN); + $list->info[$i]->status = $this->BIZ_train_model->get_biz_jol($v->COLD_SN); + $i++; + } + $list->cols_id=$cols_id; + } + + //查询聚合余额 + $back_data = GetPost_http("http://op.juhe.cn/trainTickets/balance.php?key=79f03107b921ef31310bd40a1415c1cb"); + $back_data = json_decode($back_data); + if(!empty($back_data->result)){ + $list->balance = $back_data->result; + }else{ + $list->balance = "NULL"; + } + //print_r($list); + $this->load->view('common/header'); + $this->load->view('homepage',$list); + $this->load->view('common/footer'); + } + + //系统列表页面 + public function order_list(){ + if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + dingLogin(); + } + $page_size = 10; + $page = $this->input->get("page"); + $order = $this->input->get("order"); + $web_code = $this->input->get("web_code"); + $where = "1=1";//搜索条件 + $page_parameter = "";//返回的分页条件参数 + if(empty($page) or !is_numeric($page)){ + $page=0; + } + if(!empty($order)){ + $where = "BIZ_ConfirmLineInfo.COLI_ID='{$order}' OR InfoManager.dbo.trainsystem.ts_ordernumber='{$order}'"; + //$where2 = "where BIZ_ConfirmLineInfo.COLI_ID='{$order}' OR JOL_JuheOrder='{$order}'"; + $list["order"] = $order; + $page_parameter = "order=".$order; + } + if(!empty($web_code)){ + $where = "BIZ_ConfirmLineInfo.COLI_WebCode='{$web_code}'"; + $page_parameter = "web_code=".$web_code; + } + + //获取订单数据 + $data = $this->train_system_model->get_order($page_size,$page,$where); + //print_r($data);die(); + $list["data"]=$data->list; + + $this->load->library('pagination'); + + $config['base_url'] = site_url("/apps/trainsystem/pages/order_list?{$page_parameter}"); + $config['total_rows'] = $data->count; + $config['per_page'] = $page_size; + $config['page_query_string']=TRUE; + $config['query_string_segment']="page"; + $config['cur_tag_open'] = '
    • '; + $config['cur_tag_close'] = '
      • '; + $config['first_tag_open']=$config['last_tag_open']=$config['next_tag_open']=$config['prev_tag_open']=$config['num_tag_open']="
    • "; + $config['first_tag_close']=$config['last_tag_close']=$config['next_tag_close']=$config['prev_tag_close']=$config['num_tag_close']="
      • "; + + $this->pagination->initialize($config); + + $list["page_link"]=$this->pagination->create_links(); + + foreach ($list["data"] as $key => $value) { + $value->info = $this->order_status_msg[$value->ts_status];//自定义说明信息; + } + + + $this->load->view('header'); + $this->load->view('order_list',$list); + $this->load->view('footer'); + } + + //订单详情页面 + public function order(){ + if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + dingLogin(); + } + $ordernumber = $order=$this->input->get("order"); + + if(empty($ordernumber)){ + exit('参数错误'); + } + + //根据订单号查询订单信息 + $data = array(); + $train_infos = $this->train_system_model->get_train_infos($ordernumber); + $passpager_detail = $this->train_system_model->get_passager_details($ordernumber); + + //构造详情数组 + $data['status'] = $train_infos->ts_status; + $data['ordernumber'] = $train_infos->ts_ordernumber; + $data['train_date'] = $train_infos->ts_startdate; + $data['checi'] = $train_infos->ts_checi; + $data['elecnumber'] = $train_infos->ts_elecnumber; + $data['from_station_name'] = $train_infos->ts_fromstationame; + $data['from_station_code'] = $train_infos->ts_fromstationcode; + $data['to_station_name'] = $train_infos->ts_tostationame; + $data['to_station_code'] = $train_infos->ts_tostationcode; + $data['start_time'] = $train_infos->ts_startime; + $data['arrive_time'] = $train_infos->ts_endtime; + $data['channel'] = $train_infos->ts_channel; + $data['msg'] = $train_infos->ts_errormsg; + $data['passengers'] = $passpager_detail; + + //聚合订单可以查询实时数据 + if($train_infos->ts_channel == 'juhe'){ + $post_data=array( + "key"=>"79f03107b921ef31310bd40a1415c1cb", + "orderid"=>$train_infos->ts_ordernumber + ); + $back_data = GetPost_http("http://op.juhe.cn/trainTickets/orderStatus",$post_data); + $data['train_date'] = ''; + $data['start_time'] = json_decode($back_data)->result->start_time; + $data['arrive_time'] = json_decode($back_data)->result->arrive_time; + } + + $this->load->view('bootstrap3/header'); + $this->load->view('order',$data); + $this->load->view('bootstrap3/footer'); + } + + //退票页面 + public function refund(){ + if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + dingLogin(); + } + $ordernumber = $order=$this->input->get("order"); + + if(empty($ordernumber)){ + exit('参数错误'); + } + + //根据订单号查询订单信息 + $data = array(); + $train_infos = $this->train_system_model->get_train_infos($ordernumber); + $passpager_detail = $this->train_system_model->get_passager_details($ordernumber); + + //构造详情数组 + $data['ordernumber'] = $train_infos->ts_ordernumber; + $data['cold_sn'] = $train_infos->ts_cold_sn; + $data['train_date'] = $train_infos->ts_startdate; + $data['checi'] = $train_infos->ts_checi; + $data['elecnumber'] = $train_infos->ts_elecnumber; + $data['from_station_name'] = $train_infos->ts_fromstationame; + $data['from_station_code'] = $train_infos->ts_fromstationcode; + $data['to_station_name'] = $train_infos->ts_tostationame; + $data['to_station_code'] = $train_infos->ts_tostationcode; + $data['start_time'] = $train_infos->ts_startime; + $data['arrive_time'] = $train_infos->ts_endtime; + $data['channel'] = $train_infos->ts_channel; + $data['msg'] = $train_infos->ts_errormsg; + $data['return_json'] = $train_infos->ts_returncallback; + $data['passengers'] = $passpager_detail; + + //print_r($data); + $this->load->view('header'); + $this->load->view('refund',$data); + $this->load->view('footer'); + + } + + public function export(){ + if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + dingLogin(); + } + $this->load->view('header'); + $this->load->view('export'); + $this->load->view('footer'); + } +} \ No newline at end of file diff --git a/application/third_party/trainsystem/controllers/returnorders.php b/application/third_party/trainsystem/controllers/returnorders.php new file mode 100644 index 00000000..078bf373 --- /dev/null +++ b/application/third_party/trainsystem/controllers/returnorders.php @@ -0,0 +1,153 @@ +load->helper('train'); + $this->load->model("train_system_model"); + $this->load->model("Sendmail_model"); + $this->load->model('BIZ_train_model'); + } + + public function index(){ + echo 'return tickets'; + } + + public function returntickets(){ + //第三方订单号(为了避免一个子订单乘客分开出票而产生错误) + $ordernumber = $this->input->get_post('ordernumber'); + //护照姓名 + $passportname = $this->input->get_post('passportname'); + //护照号 + $passportno = $this->input->get_post('passportno'); + + if(!$ordernumber || !$passportname || !$passportno){ + header("HTTP/1.1 404 Not Found"); + exit('{"reason":"传参错误","status":"404"}'); + } + + //网前提交的姓名没有做处理 + $passportname = chk_sp_name($passportname); + + $ticket_data = $this->train_system_model->ticketfrom($ordernumber); + $passenger_data = $this->train_system_model->get_passenger_info($ordernumber,$passportname,$passportno); + + $channel = $ticket_data->ts_channel; + + if(empty($passenger_data)){ + exit('乘客信息为空无法退票'); + } + + switch ($channel){ + case 'juhe': + $this->juheModel($ticket_data,$passenger_data); + break; + case 'ctrip': + $this->ctripModel($ticket_data,$passenger_data); + break; + } + } + + function juheModel($ticket_data,$data){ + $post_data = array( + "key"=>JUHE_TRAIN_API_KEY, + "orderid"=>$ticket_data->ts_ordernumber + ); + $back_json = GetPost_http(JUHE_TRAIN_STATUS_API,$post_data); + $back_detail_data = json_decode($back_json); + //print_r($back_data);die(); + foreach($back_detail_data->result->passengers as $items){ + if($items->passengersename == $data->tst_realname && $items->passportseno == $data->tst_numberid){ + $ticket_no = $items->ticket_no; + } + } + + //发起退票 + $post_data1 = array( + "key"=>JUHE_TRAIN_API_KEY, + "orderid"=>$ticket_data->ts_ordernumber, + "tickets"=>'[{"ticket_no":"'.$ticket_no.'","passengername":"'.$data->tst_realname.'","passporttypeseid":"'.strexchangeid($data->tst_ticketype).'","passportseno":"'.$data->tst_numberid.'"}]', + ); + //print_r($post_data1);die(); + $back_json = GetPost_http(JUHE_TRAIN_REFUND_API,$post_data1); + //print_r($post_data1); + + log_message('error','聚合退票：'.$ticket_data->ts_ordernumber.'|'.$back_json); + $back_data = json_decode($back_json); + + if($back_data->error_code == '0'){ + //退票成功后发送一封邮件 + $fromName = 'trainsystem'; + $fromEmail = 'cyc@hainatravel.com'; + $coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($ticket_data->ts_cold_sn); + $coli_id = $coli_id['0']->COLI_ID; + $info = $this->BIZ_train_model->get_operatorInfo($coli_id); + $toName = $info[0]->OPI_Name; + $toEmail = $info[0]->OPI_Email; + $subject = '退票请求'; + $body = $back_detail_data->result->ordernumber.' 提出退票,乘客:'.$data->tst_realname.', '.$back_detail_data->result->start_time.' '.$back_detail_data->result->checi; + $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); + echo '{"reason":"退票成功","status":"200"}'; + }else{ + header("HTTP/1.1 404 Not Found"); + echo '{"reason":"退票失败","status":"404"}'; + } + } + + function ctripModel($ticket_data,$passenger_data){ + $PostData = array(); + $TimeStamp = time(); + $time = date('Y-m-d H:i:s',$TimeStamp); + $PostData['Authentication']->TimeStamp = $time; + $PostData['Authentication']->ServiceName = 'order.ticketReturn'; + $PostData['Authentication']->PartnerName = ORDERUSER; + $MessageIdentity = md5($time.'order.ticketReturn'.ORDERKEY); + $PostData['Authentication']->MessageIdentity = $MessageIdentity; + + $PostData['TrainOrderService']->contactName = '陈宇超'; + $PostData['TrainOrderService']->contactMobile = '18877381547'; + $PostData['TrainOrderService']->OrderNumber = $ticket_data->ts_ordernumber; + $PostData['TrainOrderService']->OperatorType = '0'; + $PostData['TrainOrderService']->TicketInfo = ''; + $PostData['TrainOrderService']->TicketInfo = array(); + + $i = 0; + $PostData['TrainOrderService']->TicketInfo[$i]['eOrderNumber'] = $passenger_data->ts_elecnumber; + if($passenger_data->tst_ticketype == '儿童票'){ + $PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '2'; + }else{ + $PostData['TrainOrderService']->TicketInfo[$i]['eOrderType'] = '1'; + } + $PostData['TrainOrderService']->TicketInfo[$i]['seatNumber'] = $passenger_data->tst_seatdetail; + $PostData['TrainOrderService']->TicketInfo[$i]['passportName'] = $passenger_data->tst_realname; + $PostData['TrainOrderService']->TicketInfo[$i]['passport'] = $passenger_data->tst_numberid; + $PostData['TrainOrderService']->TicketInfo[$i]['realName'] = $passenger_data->tst_realname; + + //发起退票请求 + $Url = 'http://m.ctrip.com/restapi/soa2/11009/json/PartnerReturnTicket'; + $ResponseJson = GetPost_http($Url,json_encode($PostData),'POST'); + $ResponseData = json_decode($ResponseJson); + + if($ResponseData->Status == 'SUCCESS'){ + $fromName = 'trainsystem'; + $fromEmail = 'cyc@hainatravel.com'; + $coli_id = $this->BIZ_train_model->cold_sn_get_coli_id($ticket_data->ts_cold_sn); + $coli_id = $coli_id['0']->COLI_ID; + $info = $this->BIZ_train_model->get_operatorInfo($coli_id); + $toName = $info[0]->OPI_Name; + $toEmail = $info[0]->OPI_Email; + $subject = '退票请求'; + $body = '乘客:'.$data->tst_realname.' 对订单:'.$data->ts_ordernumber.'发起退票请求！！！'; + $this->Sendmail_model->SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body); + echo '{"reason":"退票成功","status":"200"}'; + }else{ + header("HTTP/1.1 404 Not Found"); + echo '{"reason":"退票失败","status":"404"}'; + } + } + + +} \ No newline at end of file diff --git a/application/third_party/trainsystem/helpers/train_helper.php b/application/third_party/trainsystem/helpers/train_helper.php new file mode 100644 index 00000000..d79db5e6 --- /dev/null +++ b/application/third_party/trainsystem/helpers/train_helper.php @@ -0,0 +1,89 @@ + \ No newline at end of file diff --git a/application/third_party/trainsystem/libraries/Des.php b/application/third_party/trainsystem/libraries/Des.php new file mode 100644 index 00000000..b2ea6b5f --- /dev/null +++ b/application/third_party/trainsystem/libraries/Des.php @@ -0,0 +1,59 @@ +pkcs5_pad($string, $size); + $td = mcrypt_module_open('des', '', 'ecb', ''); + $iv = @mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); + @mcrypt_generic_init($td, $key, $iv); + $data = mcrypt_generic($td, $string); + mcrypt_generic_deinit($td); + mcrypt_module_close($td); + $data = base64_encode($data); + return $data; + } + + function decrypt($string,$key) + { + $string = base64_decode($string); + $td = mcrypt_module_open('des', '', 'ecb', ''); + //使用MCRYPT_DES算法,cbc模式 + $iv = @mcrypt_create_iv(mcrypt_enc_get_iv_size($td), MCRYPT_RAND); + $ks = mcrypt_enc_get_key_size($td); + @mcrypt_generic_init($td, $key, $iv); + //初始处理 + $decrypted = mdecrypt_generic($td, $string); + //解密 + mcrypt_generic_deinit($td); + //结束 + mcrypt_module_close($td); + + $result = $this->pkcs5_unpad($decrypted); + //$result = mb_convert_encoding($result, 'UTF-8', 'GBK'); + return $result; + } + + function pkcs5_pad($text, $blocksize) + { + $pad = $blocksize - (strlen($text) % $blocksize); + return $text . str_repeat(chr($pad), $pad); + } + + function pkcs5_unpad($text) + { + $pad = ord($text{strlen($text) - 1}); + if ($pad > strlen($text)) { + return false; + } + if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) { + return false; + } + return substr($text, 0, -1 * $pad); + } +} + +?> \ No newline at end of file diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php new file mode 100644 index 00000000..bd392858 --- /dev/null +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -0,0 +1,492 @@ +HT = $this->load->database('HT', TRUE); + $this->INFO = $this->load->database('INFO', TRUE); + } + + //获取订单信息 + function biz_order_detail($cold_sn) { + $sql = " + SELECT TOP 1 bfoi.FOI_SN + ,bfoi.FOI_COLD_SN + ,bfoi.DepartAirport + ,bfoi.ArrivalAirport + ,bfoi.FlightsNo + ,bfoi.Aircraft + ,bfoi.DepartureDate + ,bfoi.FOI_SelectedSeat + ,( + SELECT TOP 1 TRS_StationCN + FROM TrainStation + WHERE TRS_Code = DepartAirport + and ISNULL(TRS_StationCN,'')<>'' + ) AS DepartAirport_cn + ,( + SELECT TOP 1 TRS_StationCN + FROM TrainStation + WHERE TRS_Code = ArrivalAirport + and ISNULL(TRS_StationCN,'')<>'' + ) AS ArrivalAirport_cn, + FOI_TrainNetOrderNo, + bfoi.adultcost, + bfoi.childcost, + ArrivalTime, + DepartureTime + FROM BIZ_FlightsOrderInfo bfoi + WHERE bfoi.FOI_COLD_SN = ? + "; + $query = $this->HT->query($sql, $cold_sn); + if ($query->num_rows() > 0) { + return $query->row(); + } else { + return false; + } + } + + //传入一组BPE_SN获取乘客信息 + function in_bpesn_people_info($bpe_sn){ + $sql = " + SELECT bbp.BPE_SN + ,bbp.BPE_FirstName + ,bbp.BPE_MiddleName + ,bbp.BPE_LastName + ,bbp.BPE_GuestType + ,bbp.BPE_Passport + ,bbp.BPE_PassportType + ,bbp.BPE_SEX + ,bbp.BPE_BirthDate + ,bbp.BPE_PassExpdate + FROM BIZ_BookPeople bbp + WHERE BPE_SN in(".$bpe_sn.") + "; + $query = $this->HT->query($sql); + return $query->result(); + } + + //传入主订单翰特订单号COLI_ID（161014006M），获取子订单中火车订单的COLD_SN + function get_biz_cold($cols_id) { + $sql = "SELECT COLD_SN + FROM BIZ_ConfirmLineDetail bcld + WHERE bcld.COLD_COLI_SN=( + SELECT COLI_SN FROM BIZ_ConfirmLineInfo bcli WHERE bcli.COLI_ID=?) + AND bcld.DeleteFlag=0 AND bcld.COLD_ServiceType='2'"; + $query = $this->HT->query($sql, $cols_id); + return $query->result(); + } + + //传入子订单COLD_SN，获取子订单对应的乘客信息 + function biz_people($cold_sn) { + $sql = " + SELECT bbp.BPE_SN + ,bbp.BPE_FirstName + ,bbp.BPE_MiddleName + ,bbp.BPE_LastName + ,bbp.BPE_GuestType + ,bbp.BPE_Passport + ,bbp.BPE_PassportType + FROM BIZ_BookPeople bbp + WHERE EXISTS( + SELECT TOP 1 1 + FROM BIZ_BookPeopleList bbpl + WHERE bbpl.BPL_BPE_SN = bbp.BPE_SN + AND bbpl.BPL_COLD_SN = ? + ) + "; + $query = $this->HT->query($sql, $cold_sn); + return $query->result(); + } + + //传入COLD_SN，获取火车车次等信息 + function get_biz_foi($cold_sn) { + $sql = " + SELECT FOI_COLD_SN, + FlightsNo, + Cabin, + Aircraft, + DepartureCity, + DepartAirport, + ArrivalAirport, + ArrivalCity, + DepartureDate, + DepartureTime, + ArrivalTime, + adultcost, + FOI_SelectedSeat, + FOI_TrainNetOrderNo, + FOI_SaleDate, + ( + SELECT TOP 1 TRS_StationCN + FROM TrainStation + WHERE TRS_Code = DepartAirport + ) AS DepartAirport_cn + ,( + SELECT TOP 1 TRS_StationCN + FROM TrainStation + WHERE TRS_Code = ArrivalAirport + ) AS ArrivalAirport_cn + FROM BIZ_FlightsOrderInfo + WHERE FOI_COLD_SN = ? + "; + $query = $this->HT->query($sql, $cold_sn); + return $query->result(); + } + + //传入COLD_SN，获取BIZ_JuheOrderList是否存在此子订单，用来判断是否提交过给聚合 + function get_biz_jol($cold_sn) { + $sql = "SELECT top 1 JOL_SN FROM BIZ_JuheOrderList WHERE JOL_COLD_SN= ?"; + $query = $this->HT->query($sql, $cold_sn); + if($query->num_rows() == 0){ + return true; + }else{ + return false; + } + } + + //传入COLI_ID，获取外联名 + function get_operatorInfo($cols_id) { + $sql = " + SELECT + Name, + OPI_Name, + case when OPI_SN=375 then OPI_EmailBak else OPI_Email end as OPI_Email, + tel, + Mobile, + Email + FROM OperatorInfo + left join agenter_user + on AU_OPI_SN = OPI_SN + WHERE OPI_SN = ( + SELECT COLI_OPI_ID + FROM BIZ_ConfirmLineInfo bcli + WHERE bcli.COLI_ID = ? + ) + and agenter in ('cht', 'train_vac', 'jp', 'train_it', 'vc', 'ru') + "; + $query = $this->HT->query($sql, $cols_id); + return $query->result(); + } + + //新增支付记录 + public function add_train_payment($data){ + //主表ID，下面两个地方用到，所以先筛选出来，不知道能不能通过合并提高效率 + $sql="SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN=?"; + $query=$this->HT->query($sql,$data->TOC_COLD_SN); + $query=$query->result(); + $CCSN=$query[0]->COLD_COLI_SN; + //删除多余支付记录 + $sql = "delete from BIZ_TrainOrderCost where TOC_COLI_SN = '{$CCSN}' and TOC_TicketCost is null"; + $query=$this->HT->query($sql); + if(empty($data->FOI_TrainNetOrderNo)){ + //退票 + $sql="IF NOT EXISTS( + SELECT TOP 1 1 FROM BIZ_TrainOrderCost + WHERE TOC_COLD_SN = ? AND TOC_Memo like ? + ) + INSERT INTO BIZ_TrainOrderCost( + TOC_Memo, + TOC_CreateDate, + TOC_COLI_SN, + TOC_COLD_SN, + TOC_TrainNumber, + TOC_DepartureDate, + TOC_TicketCost, + TOC_WL + ) + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}))"; + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%","退票费 ".$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost)); + }else{ + //出票 + //BIZ_FlightsOrderInfo.FOI_TrainNetOrderNo,更新取票号 + /* + UPDATE BIZ_FlightsOrderInfo + SET + FOI_TrainNetOrderNo=? + WHERE + FOI_COLD_SN=? + */ + $sql="IF EXISTS( + select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and (FOI_TrainNetOrderNo is null or FOI_TrainNetOrderNo = '' or FOI_TrainNetOrderNo = '$data->FOI_TrainNetOrderNo')) + UPDATE BIZ_FlightsOrderInfo + SET + FOI_TrainNetOrderNo='$data->FOI_TrainNetOrderNo' + WHERE + FOI_COLD_SN='$data->TOC_COLD_SN' + ELSE + IF NOT EXISTS(select * from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN' and FOI_TrainNetOrderNo LIKE '%$data->FOI_TrainNetOrderNo%') + UPDATE BIZ_FlightsOrderInfo + SET + FOI_TrainNetOrderNo=(select FOI_TrainNetOrderNo from BIZ_FlightsOrderInfo where FOI_COLD_SN = '$data->TOC_COLD_SN') + '&' + '$data->FOI_TrainNetOrderNo' + WHERE + FOI_COLD_SN='$data->TOC_COLD_SN'"; + + $this->HT->query($sql); + + $sql="IF NOT EXISTS( + SELECT TOP 1 1 FROM BIZ_TrainOrderCost + WHERE TOC_COLD_SN = ? AND TOC_Memo like ? + ) + INSERT INTO BIZ_TrainOrderCost( + TOC_Memo, + TOC_CreateDate, + TOC_COLI_SN, + TOC_COLD_SN, + TOC_TrainNumber, + TOC_DepartureDate, + TOC_TicketCost, + TOC_WL, + TOC_OtherCost + ) + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1)"; + $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage)); + } + return $query; + } + + public function update_cold_planvei_sn($cold_sn){ + $sql = "update BIZ_ConfirmLineDetail set COLD_PlanVEI_SN=30427 where COLD_SN = ?"; + $query = $this->HT->query($sql,$cold_sn); + } + + //自动获取符合自动出票要求的订单的coli_sn + function auto_check_ticket(){ + $sql = "SELECT distinct top 20 COLD_SN ,coli_id,COLD_SPFS,COLI_State + FROM BIZ_ConfirmLineInfo bcli + inner join BIZ_ConfirmLineDetail bcld on COLD_COLI_SN=COLI_SN + LEFT JOIN BIZ_GroupAccountInfo bgai + ON bcli.COLI_SN = bgai.GAI_COLI_SN + WHERE bcli.COLI_ServiceType = '2' + AND bcli.COLI_State in ('11','13','8','63') + AND bcli.COLI_WebCode in ('cht', 'JP', 'train_it', 'VC', 'train_ru','GM-Train','SHT','CT') + AND (bcli.COLI_Price - bgai.GAI_SQJE) <= 20 + AND (bcli.COLI_Price - bgai.GAI_SQJE) >= 0 + AND bcli.DeleteFlag = 0 + AND bgai.DeleteFlag = 0 + AND bcld.DeleteFlag = 0 + --AND COLD_SPFS<=2 + AND NOT EXISTS ( + SELECT TOP 1 1 + FROM InfoManager.dbo.trainsystem + WHERE ts_cold_sn = COLD_SN + ) + and (((COLI_State<>8 and COLI_State<>63) and COLD_StartDate < CONVERT(varchar(100),GETDATE()+29,23)) or ((COLI_State=8 or COLI_State=63) and COLD_StartDate between CONVERT(varchar(100),GETDATE()+29,23) and CONVERT(varchar(100),GETDATE()+29,23)+' 23:59')) + "; + $query = $this->HT->query($sql); + return $query->result(); + } + + public function get_saletime($station){ + $sql = 'select TST_saletime from TrainSaleTime where TST_station_cn = ?'; + $query = $this->HT->query($sql,$station); + return $query->row(); + } + + //筛选符合发送邮件的订单 + public function auto_sendmail(){ + $sql = "SELECT + ts_cold_sn, + ts_ordernumber, + ts_status, + ts_isauto + FROM + trainsystem + left join + Tourmanager.dbo.BIZ_ConfirmLineDetail bcld + on + bcld.COLD_SN = ts_cold_sn + left join + Tourmanager.dbo.BIZ_ConfirmLineInfo bcli + on + bcld.COLD_COLI_SN = bcli.COLI_SN + WHERE + ts_sendmail is null + AND + ts_isauto = 1 + AND + ts_status != '0' + AND + ts_status != 'e' + AND + ts_status != '2' + AND + bcli.COLI_WebCode = 'cht' + "; + $query = $this->INFO->query($sql); + return $query->result(); + } + + // 传入 cold_sn 获取订单号 + public function cold_sn_get_coli_id($cold_sn){ + $sql="SELECT COLI_ID FROM BIZ_ConfirmLineInfo + WHERE COLI_SN = ( + SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN = ? + ) + "; + $query = $this->HT->query($sql,array($cold_sn)); + return $query->result(); + } + + //邮件使用 + function get_user_info($jh_order){ + $sql = "select + * + from + Tourmanager.dbo.BIZ_ConfirmLineDetail + where + COLD_SN = ( + select + top 1 ts_cold_sn + from + trainsystem + where + ts_ordernumber = ? + )"; + $query = $query = $this->INFO->query($sql, $jh_order); + if ($query->num_rows() > 0) { + return $query->row(); + } else { + return false; + } + } + + //用于自动出票,传入主订单翰特订单号 COLI_ID ，获取客人的姓名和邮箱 + public function get_guest_info($COLI_ID){ + $sql = "SELECT GUT_FirstName,GUT_LastName,GUT_Email FROM BIZ_GUEST bg WHERE bg.GUT_SN = + ( SELECT COLI_GUT_SN FROM BIZ_ConfirmLineInfo bcli WHERE bcli.COLI_ID = ?) + "; + $query = $this->HT->query($sql,$COLI_ID); + return $query->result(); + } + + //获取paypal付款记录 + function get_paypal($coli_id){ + $sql = "select top 1 GAI_SQJE from BIZ_GroupAccountInfo where GAI_COLI_ID = ?"; + $query = $query = $this->HT->query($sql, $coli_id); + if ($query->num_rows() > 0) { + return $query->row(); + } else { + return false; + } + } + + //通过 JOL_JuheOrder 获取 BIZ_JuheOrderList 获取聚合订单详情 + public function get_biz_jol_info($cold_sn,$jol_jo){ + $sql = "SELECT top 1 + * + FROM trainsystem + WHERE ts_cold_sn = ? AND ts_ordernumber = ? + "; + $query = $this->INFO->query($sql,array($cold_sn,$jol_jo)); + return $query->row(); + } + + //获取跟踪号 + public function getTrackingCode(){ + include('c:/database_conn.php'); + $connection = array( + 'UID' => $db['HT']['username'], + 'PWD' => $db['HT']['password'], + 'Database' => 'tourmanager', + 'ConnectionPooling' => 1, + 'CharacterSet' => 'utf-8', + 'ReturnDatesAsStrings' => 1 + ); + $conn = sqlsrv_connect($db['HT']['hostname'], $connection); + $stmt = sqlsrv_query($conn, "exec dbo.SP_getTrackingCode;"); + if ($stmt === false) { + echo "Error in executing statement 3.\n"; + die(print_r(sqlsrv_errors(), true)); + }else{ + //存储过程中每一个select都会产生一个结果集，取某个结果集就需要从第一个移动到需要的那个结果集 + //如果结果集为空就移到下一个 + while (sqlsrv_has_rows($stmt) !== TRUE) { + sqlsrv_next_result($stmt); + } + + $result_object = array(); + while ($row = sqlsrv_fetch_object($stmt)) { + $result_object[] = $row; + } + + sqlsrv_free_stmt($stmt); + sqlsrv_close($conn); + + return($result_object[0]->TrackingCode); + } + } + + //接收聚合订单号，获取翰特订单号，即BIZ_ConfirmLineInfo的COLI_ID + function jh_order_get_coli_id($ordernumber){ + $sql="SELECT + COLI_ID,COLI_SN,COLI_OPI_ID + FROM + BIZ_ConfirmLineInfo bcli + WHERE + bcli.COLI_SN= + (SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail bcld WHERE bcld.COLD_SN= + (SELECT ts_cold_sn FROM InfoManager.dbo.trainsystem WHERE ts_ordernumber = ? and ts_channel = 'juhe')) + "; + $query = $this->HT->query($sql, $ordernumber); + return $query->result(); + } + + //跟踪号与订单关联 + public function linkTrackingCode($coli_sn,$TrackCode){ + include('c:/database_conn.php'); + $connection = array( + 'UID' => $db['HT']['username'], + 'PWD' => $db['HT']['password'], + 'Database' => 'tourmanager', + 'ConnectionPooling' => 1, + 'CharacterSet' => 'utf-8', + 'ReturnDatesAsStrings' => 1 + ); + $conn = sqlsrv_connect($db['HT']['hostname'], $connection); + $stmt = sqlsrv_query($conn, "exec dbo.SP_recordTrackingCode '$coli_sn', '$TrackCode'"); + if ($stmt === false) { + echo "Error in executing statement 3.\n"; + die(print_r(sqlsrv_errors(), true)); + }else{ + //存储过程中每一个select都会产生一个结果集，取某个结果集就需要从第一个移动到需要的那个结果集 + //如果结果集为空就移到下一个 + /* + while (sqlsrv_has_rows($stmt) !== TRUE) { + sqlsrv_next_result($stmt); + } + + $result_object = array(); + while ($row = sqlsrv_fetch_object($stmt)) { + $result_object[] = $row; + } + */ + sqlsrv_free_stmt($stmt); + sqlsrv_close($conn); + + + } + } + + //通过COLI_ID获取团名 即 GroupInfo的GRI_No + function get_gri_no($coli_id){ + $sql="SELECT GRI_No FROM GroupInfo + WHERE GRI_SN=( + SELECT COLI_GRI_SN FROM BIZ_ConfirmLineInfo WHERE COLI_ID=? + ) + "; + $query = $this->HT->query($sql, $coli_id); + return $query->result(); + } + + //修改 + function update_biz_jol($where,$data){ + return $this->INFO->where($where)->update("trainsystem", $data); + } + + function delete_other(){ + $sql = "delete from trainsystem where ts_id = '860'"; + $query = $this->INFO->query($sql); + } +} diff --git a/application/third_party/trainsystem/models/sendmail_model.php b/application/third_party/trainsystem/models/sendmail_model.php new file mode 100644 index 00000000..98ec89bc --- /dev/null +++ b/application/third_party/trainsystem/models/sendmail_model.php @@ -0,0 +1,157 @@ +HT = $this->load->database('HT', TRUE); + } + + function SendMailToTable($fromName,$fromEmail,$toName,$toEmail,$subject,$body) + { + $time = date('Y-m-d H:i:s',time()); + if($this->validEmail($toEmail)) + { + $data = array( + "M_ReplyToName" => $fromName, //回复人 + "M_ReplyToEmail" => $fromEmail, //回复地址 + "M_ToName" => $toName, //收件人名 + "M_ToEmail" => $toEmail, //收件邮件地址 + "M_Title" => $subject, //主题 + "M_Body" => $body, //邮件正文 + "M_Web" => "CHT", //所属站点 + "M_FromName" => "Chinahighlights.com", //站点名称 + "M_State" => 0, + "M_AddTime" => $time + ); + $this->HT->insert('Email_AutomaticSend',$data); + $m_sn = $this->HT->insert_id('Email_AutomaticSend'); + return $m_sn; + }else{ + return FALSE; + } + } + + function SendMailToTabletest($fromName,$fromEmail,$toName,$toEmail,$subject,$body) + { + $time = date('Y-m-d H:i:s',time()); + if($this->validEmail($toEmail)) + { + $data = array( + "M_ReplyToName" => $fromName, //回复人 + "M_ReplyToEmail" => $fromEmail, //回复地址 + "M_ToName" => $toName, //收件人名 + "M_ToEmail" => $toEmail, //收件邮件地址 + "M_Title" => $subject, //主题 + "M_Body" => $body, //邮件正文 + "M_Web" => "CHT", //所属站点 + "M_FromName" => "Chinahighlights.com", //站点名称 + "M_State" => 0, + "M_AddTime" => $time, + ); + $this->HT->insert('Email_AutomaticSend',$data); + $m_sn = $this->HT->insert_id('Email_AutomaticSend'); + return $m_sn; + }else{ + return FALSE; + } + } + + + public function validEmail($email){ + $isValid = true; + $atIndex = strrpos($email, "@"); + if (is_bool($atIndex) && !$atIndex){ + $isValid = false; + }else{ + $domain = substr($email, $atIndex+1); + $local = substr($email, 0, $atIndex); + $localLen = strlen($local); + $domainLen = strlen($domain); + $domain = str_replace(' ','',$domain); + if ($localLen < 1 || $localLen > 64){ + // local part length exceeded + $isValid = false; + }else if ($domainLen < 1 || $domainLen > 255){ + // domain part length exceeded + $isValid = false; + }else if ($local[0] == '.' || $local[$localLen-1] == '.'){ + // local part starts or ends with '.' + $isValid = false; + }else if (preg_match('/\\.\\./', $local)){ + // local part has two consecutive dots + $isValid = false; + }else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)){ + // character not valid in domain part + $isValid = false; + }else if (preg_match('/\\.\\./', $domain)){ + // domain part has two consecutive dots + $isValid = false; + }else if(!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',str_replace("\\\\","",$local))){ + // character not valid in local part unless + // local part is quoted + if (!preg_match('/^"(\\\\"|[^"])+"$/',str_replace("\\\\","",$local))){ + $isValid = false; + } + } + /* + 不检查是否有DNS解析 + if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A"))){ + // domain not found in DNS + $isValid = false; + } + */ + } + return $isValid; + } + + public function validEmailtest($email){ + $isValid = true; + $atIndex = strrpos($email, "@"); + if (is_bool($atIndex) && !$atIndex){ + $isValid = false; + }else{ + $domain = substr($email, $atIndex+1); + $local = substr($email, 0, $atIndex); + $localLen = strlen($local); + $domainLen = strlen($domain); + $domain = str_replace(' ','',$domain); + print_r(preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)); + if ($localLen < 1 || $localLen > 64){ + // local part length exceeded + $isValid = false; + }else if ($domainLen < 1 || $domainLen > 255){ + // domain part length exceeded + $isValid = false; + }else if ($local[0] == '.' || $local[$localLen-1] == '.'){ + // local part starts or ends with '.' + $isValid = false; + }else if (preg_match('/\\.\\./', $local)){ + // local part has two consecutive dots + $isValid = false; + }else if (!preg_match('/^[A-Za-z0-9\\-\\.]+$/', $domain)){ + // character not valid in domain part + $isValid = false; + }else if (preg_match('/\\.\\./', $domain)){ + // domain part has two consecutive dots + $isValid = false; + }else if(!preg_match('/^(\\\\.|[A-Za-z0-9!#%&`_=\\/$\'*+?^{}|~.-])+$/',str_replace("\\\\","",$local))){ + // character not valid in local part unless + // local part is quoted + if (!preg_match('/^"(\\\\"|[^"])+"$/',str_replace("\\\\","",$local))){ + $isValid = false; + } + } + /* + 不检查是否有DNS解析 + if ($isValid && !(checkdnsrr($domain,"MX") || checkdnsrr($domain,"A"))){ + // domain not found in DNS + $isValid = false; + } + */ + } + return $isValid; + } + +} \ No newline at end of file diff --git a/application/third_party/trainsystem/models/train_system_model.php b/application/third_party/trainsystem/models/train_system_model.php new file mode 100644 index 00000000..9b84793a --- /dev/null +++ b/application/third_party/trainsystem/models/train_system_model.php @@ -0,0 +1,267 @@ +HT = $this->load->database('HT', TRUE); + $this->INFO = $this->load->database('INFO', TRUE); + } + + public function get_order($pagesize=2,$page=0,$where="1=1"){ + $data=new StdClass(); + //获取总条数 + $sql="SELECT COUNT(*) AS count FROM InfoManager.dbo.trainsystem + LEFT JOIN + BIZ_ConfirmLineInfo + ON + BIZ_ConfirmLineInfo.COLI_SN=(SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN = InfoManager.dbo.trainsystem.ts_cold_sn) + WHERE + {$where} + "; + $query = $this->HT->query($sql); + $count=$query->result(); + $data->count=$count[0]->count; + + $sql="SELECT TOP {$pagesize} InfoManager.dbo.trainsystem.ts_subtime, + InfoManager.dbo.trainsystem.ts_cold_sn, + InfoManager.dbo.trainsystem.ts_ordernumber, + InfoManager.dbo.trainsystem.ts_status, + InfoManager.dbo.trainsystem.ts_errormsg, + InfoManager.dbo.trainsystem.ts_fromstationame, + InfoManager.dbo.trainsystem.ts_tostationame, + InfoManager.dbo.trainsystem.ts_checi, + InfoManager.dbo.trainsystem.ts_orderamount, + InfoManager.dbo.trainsystem.ts_isauto, + InfoManager.dbo.trainsystem.ts_sendmail, + InfoManager.dbo.trainsystem.ts_m_sn, + InfoManager.dbo.trainsystem.ts_channel, + BIZ_ConfirmLineInfo.COLI_ID, + BIZ_ConfirmLineInfo.COLI_WebCode + FROM + InfoManager.dbo.trainsystem + LEFT JOIN + BIZ_ConfirmLineInfo + ON + BIZ_ConfirmLineInfo.COLI_SN=(SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN = InfoManager.dbo.trainsystem.ts_cold_sn) + WHERE + InfoManager.dbo.trainsystem.ts_id NOT IN( + SELECT + TOP {$page} ts_id + FROM + InfoManager.dbo.trainsystem + LEFT JOIN + BIZ_ConfirmLineInfo + ON + BIZ_ConfirmLineInfo.COLI_SN=(SELECT COLD_COLI_SN FROM BIZ_ConfirmLineDetail WHERE COLD_SN = InfoManager.dbo.trainsystem.ts_cold_sn) + where {$where} + ORDER BY ts_subtime DESC) + AND + {$where} + ORDER BY InfoManager.dbo.trainsystem.ts_subtime DESC"; + + $query = $this->HT->query($sql); + $data->list=$query->result(); + return $data; + + } + + //获取指定订单信息 + public function get_passager_details($ordernumber){ + $sql = "select * from trainsystem_tickets where tst_ordernumber = '{$ordernumber}'"; + $query = $this->INFO->query($sql); + return $query->result(); + } + + //获取火车信息 + public function get_train_infos($ordernumber){ + $sql = "select * from trainsystem where ts_ordernumber = '{$ordernumber}'"; + $query = $this->INFO->query($sql); + return $query->row(); + } + + public function update_passpager_status($status,$passagerid){ + $sql = "update trainsystem_tickets set tst_status = '{$status}' where tst_id = '{$passagerid}'"; + $query = $this->INFO->query($sql); + } + + //添加订单 + function add_orders($data){ + $sql=" + INSERT INTO trainsystem( + ts_cold_sn, + ts_ordernumber, + ts_subtime, + ts_returncode, + ts_status, + ts_errormsg, + ts_fromstationame, + ts_fromstationcode, + ts_tostationame, + ts_tostationcode, + ts_startdate, + ts_startime, + ts_endtime, + ts_runtime, + ts_checi, + ts_channel, + ts_isauto + ) + VALUES( + '{$data->cold_sn}', + '{$data->ordernumber}', + getdate(), + '{$data->returncode}', + '{$data->status}', + '{$data->errormsg}', + '{$data->fromstationame}', + '{$data->fromstationcode}', + '{$data->tostationame}', + '{$data->tostationcode}', + '{$data->startdate}', + '{$data->startime}', + '{$data->endtime}', + '{$data->runtime}', + '{$data->checi}', + '{$data->channel}', + '{$data->isauto}' + ) + "; + //echo $sql; + $query = $this->INFO->query($sql); + } + + public function ticketfrom($ts_ordernumber){ + $sql = "select ts_channel,ts_cold_sn,ts_ordernumber from trainsystem where ts_ordernumber = ?"; + $query = $this->INFO->query($sql,array($ts_ordernumber)); + return $query->row(); + } + + public function get_passenger_info($ordernumber,$passportname,$passportno){ + $sql = "select * from trainsystem_tickets left join trainsystem on tst_ordernumber = ts_ordernumber where tst_realname = ? and tst_numberid = ? and tst_ordernumber = ?"; + $query = $this->INFO->query($sql,array($passportname,$passportno,$ordernumber)); + return $query->row(); + } + + function add_passagers($data){ + $sql = "IF EXISTS (select * from trainsystem_tickets where tst_ordernumber = '{$data->ordernumber}' and tst_numberid = '{$data->numberid}') + update + trainsystem_tickets + set + tst_identitytype = '{$data->identitytype}', + tst_numberid = '{$data->numberid}', + tst_ticketype = '{$data->ticketype}', + tst_ticketprice = '{$data->ticketprice}', + tst_seatstype = '{$data->seatype}', + tst_seatdetail = '{$data->seatdetail}', + tst_status = '{$data->status}' + where + tst_ordernumber = '{$data->ordernumber}' + and + tst_numberid = '{$data->numberid}' + else + INSERT INTO trainsystem_tickets ( + tst_ordernumber, + tst_status, + tst_realname, + tst_identitytype, + tst_numberid, + tst_ticketype, + tst_ticketprice, + tst_seatstype, + tst_seatdetail + )VALUES( + '{$data->ordernumber}', + '{$data->status}', + '{$data->realname}', + '{$data->identitytype}', + '{$data->numberid}', + '{$data->ticketype}', + '{$data->ticketprice}', + '{$data->seatype}', + '{$data->seatdetail}' + ) + "; + $query =$this->INFO->query($sql); + } + + public function update_orders($data){ + $where = ''; + if(!empty($data->bookcallback)){ + $where .= " + ts_seatsinfo = '{$data->seatsinfo}', + ts_checkdoor = '{$data->TicketCheck}', + ts_elecnumber = '{$data->ElectronicOrderNumber}', + ts_orderamount = '{$data->OrderTotleFee}', + ts_bookcallback = '{$data->bookcallback}',"; + }else if(!empty($data->confirmcallback)){ + $where .= "ts_confirmcallback = '{$data->confirmcallback}',"; + }else if(!empty($data->returncallback)){ + $where .= "ts_returncallback = '{$data->returncallback}',"; + }else if(!empty($data->reschedulecallback)){ + $where .= "ts_reschedulecallback = '{$data->reschedulecallback}',"; + } + $sql =" + update trainsystem + set + ts_status = '{$data->OrderStatus}', + ts_errormsg = '{$data->ErrorMsg}', + ".substr($where,0,strlen($where)-1)." + where + ts_ordernumber = '{$data->ordernumber}' + "; + //echo $sql;die(); + $query = $this->INFO->query($sql); + } + + //更新乘客表信息 + public function update_passpager_info($data){ + $sql = "update + trainsystem_tickets + set + tst_status = '{$data->status}', + tst_returncallback = '{$data->returncallback}', + tst_lasteditdate = getdate() + where + tst_ordernumber = '{$data->ordernumber}' + and + tst_realname = '{$data->realname}' + and + tst_numberid = '{$data->numberid}' + "; + $query = $this->INFO->query($sql); + } + + public function get_tickets_info($cold_sn){ + $sql = "select ts_cold_sn,ts_ordernumber,tst_realname,tst_numberid,tst_status from trainsystem left join trainsystem_tickets on ts_ordernumber = tst_ordernumber where ts_cold_sn = ? and ts_status = '4'"; + $query = $this->INFO->query($sql,array($cold_sn)); + //$sql = "select * from BIZ_JuheOrderList where JOL_COLD_SN = ? and jol_status = '4'"; + //$query = $this->HT->query($sql,array($cold_sn)); + return $query->result(); + } + + public function getallorders(){ + $sql = "select * from Tourmanager.dbo.BIZ_JuheOrderList where JOL_SubTime > '2019-03-01' and (JOL_Status = '4' or JOL_Status = '7')"; + $query = $this->HT->query($sql); + return $query->result(); + } + + public function update_juheorder($ordernumber,$subtime,$price){ + $sql = "update trainsystem set ts_subtime = ? , ts_orderamount = ? where ts_ordernumber = ?"; + $query = $this->INFO->query($sql,array($subtime,$price,$ordernumber)); + } + + //根据cold_sn 获取出票情况 + public function get_ticketinfos($cold_sn){ + $sql = "select * from trainsystem where ts_cold_sn = ? and ts_status = '4'"; + $query = $this->INFO->query($sql,array($cold_sn)); + return $query->row(); + } + + + public function test(){ + $sql = "delete from trainsystem where ts_cold_sn = '488121613_1552637689'"; + $query = $this->INFO->query($sql); + } +} \ No newline at end of file diff --git a/application/third_party/trainsystem/views/addorders.php b/application/third_party/trainsystem/views/addorders.php new file mode 100644 index 00000000..e69de29b diff --git a/application/third_party/trainsystem/views/common/footer.php b/application/third_party/trainsystem/views/common/footer.php new file mode 100644 index 00000000..b231b902 --- /dev/null +++ b/application/third_party/trainsystem/views/common/footer.php @@ -0,0 +1,43 @@ + +
      +
      +
      +
      + +

      {elapsed_time} seconds , {memory_usage} memory ,技术支持:YCC 08987705

      +
      +
      +
      +
      + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/common/header.php b/application/third_party/trainsystem/views/common/header.php new file mode 100644 index 00000000..57025d13 --- /dev/null +++ b/application/third_party/trainsystem/views/common/header.php @@ -0,0 +1,131 @@ + + + + + 出票系统 + + + + + + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/email.php b/application/third_party/trainsystem/views/email.php new file mode 100644 index 00000000..1fe9c49e --- /dev/null +++ b/application/third_party/trainsystem/views/email.php @@ -0,0 +1,33 @@ + +China train ticket(s) confirmed, Booking Number <?php echo $coli_id;?>

      China Highlights Booking Confirmation

      Dear ,

      Thank you for your payment of US$GAI_SQJE?> . The train tickets have already been issued.

      You can collect the paper ticket(s) from now on at any train station in mainland China.

      Please note:

      1.Please present the original passport(s) of all the passenger(s) and the ticket pick-up number(s) at ticket collection counters. The counter will then issue your paper train ticket(s).

      +

      See the video about how to collect the ticket(s) in China. +

      2.Please double check the train(s) information and passport information. Let us know AT ONCE if you see any mistakes below. We can try to cancel tickets to minimize your loss. A 20% cancellation fee is charged by China Railway.

      Ticket collection sentences

      The bilingual note below might help you pick up tickets at the ticket collection counter more easily.

      1.Please show me which window for picking up the train ticket. 你好，请问哪个是取票窗？

      2.Please issue the paper tickets for me. The following is the pick up number（s）.请帮我出票，电子取票号如下.

      + + + Pick up number'; + echo ''.$item->FOI_TrainNetOrderNo.''; + echo 'Train No.'; + echo ''.$item->FlightsNo.''; + echo 'Departure'; + echo ''.$item->DepartureTime.' '.$item->DepartureCity.' Station(in Chinese '.$item->DepartAirport_cn.'火车站)'; + echo 'Arrival'; + echo ''.$item->ArrivalTime.' '.$item->ArrivalCity.' Station(in Chinese '.$item->ArrivalAirport_cn.'火车站)'; + echo 'Class'; + echo ''.$item->Cabin.' ('.$seatinfo.')'; + } +?> +
      Passenger(s)

      0){echo $adult.' adult(s) ';} + if($chlid>0){echo $chlid.' chlid(s) ';} + if($baby>0){echo $baby.' baby(s) ';} + ?>

      BPE_FirstName.$item->BPE_MiddleName.$item->BPE_LastName.' , passport number '.$item->BPE_Passport.'
      '; + } + ?>

      +

      3.On your departure day, please time your arrival at the station wisely. If you are going to collect your train ticket(s) on the departure day, allow enough time waiting in the queue of the ticket collection counter, for the security x-ray check of your luggage, and for the ticket check before entering the passenger lounge. Tickets will stop being issued 30 minutes prior to departure. We suggest you be at the station at least 1.5 hours ahead of the stated departure time. Please leave at least 2.5 hours during public holidays.

      4.If you’ve already collected your ticket before the departure day, we recommend that you be at the station at least 40 minutes ahead of time. Please be at the station at least 1.5 hours during a public holiday.

      5.Please don't throw your ticket(s) away because you'll need it to exit the station.

      6.If you cancel the ticket(s) at a train station yourself, the money will be refunded to our account. Please cancel the tickets before the train departure. And email us then we will refund you accordingly.

      7.China Highlights train ticket booking policy

      Should you have any questions about your train ticket bookings, please do not hesitate to contact me.

      +

      Best Regards!

      Name?>, Travel Advisor

      Tel: tel;?> Mobile: Mobile;?>

      Fax: 86-773-2827424, 86-773-2885308

      E-mail: ;;

      WeChat: CH_train

      www.chinahighlights.com

      Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

      If you wish to share anything with my supervisor (Ms. ethel), please feel free to send your email to ethel@chinahighlights.net.

      diff --git a/application/third_party/trainsystem/views/email_before.php b/application/third_party/trainsystem/views/email_before.php new file mode 100644 index 00000000..2a077a6c --- /dev/null +++ b/application/third_party/trainsystem/views/email_before.php @@ -0,0 +1,48 @@ + +China Highlights Booking Confirmation

      China Highlights Booking Confirmation

      Dear ,

      Thanks for payment US$GAI_SQJE?> . The train tickets have already been issued.

      You can collect the paper ticket(s) from now at any train station in mainland China.

      The same passport that was used for booking should also be used for ticket collection. A renewed passport won't be acceptable even if the holder is the same person. The system does not allow us to change passport number or passenger name after issue ticket. Have to issue new ticket if wrong passport number or name.

      Please collect your paper tickets from a ticket counter in the train station. Tickets will stop being printed 30 minutes prior to departure. On departure day, please time your arrival wisely. If you are going to collect your tickets on departure day, allow for time waiting in queue at the ticket-counter, for security checks and for ticket checks. We suggest you be at the station at least 1.5 hours ahead of the stated departure time.

      If you’ve already collected before the departure day, it is also wise to be at the station at least 40 minutes ahead.

      Passenger(s)

      0){echo $adult.' adult(s) ';} + if($chlid>0){echo $chlid.' chlid(s) ';} + if($baby>0){echo $baby.' baby(s) ';} + ?>

      BPE_FirstName.$item->BPE_MiddleName.$item->BPE_LastName.' , passport number '.$item->BPE_Passport.'
      '; + } + ?>

      +Train'.++$j.':

      '; + echo ' + + '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo '
      Ticket Pick Up No.'.$item->FOI_TrainNetOrderNo.'
      Train No.'.$item->FlightsNo.'
      Departure'.$item->DepartureTime.' '.$item->DepartureCity.' Station(in Chinese '.$item->DepartAirport_cn.'火车站)
      Arrival'.$item->ArrivalTime.' '.$item->ArrivalCity.' Station(in Chinese '.$item->ArrivalAirport_cn.'火车站)
      Class'.$item->Cabin.'
      '; + } +?> +

      Kindly note below:

      1.Please present all passenger(s) original passport(s) and Ticket Pick Up No.FOI_TrainNetOrderNo?>at any ticket counters of any railway stations. They will then issue your paper train ticket(s). You can find more instruction of collecting tickets enclosure. +

      2.You can show screenshot of the paper tickets to the railway station counter. It helps get paper tickets easily.

      +'; + echo ''; + echo ' '.substr($obj->DepartureDate,0,10).'   '.$obj->FlightsNo.'   '.$obj->FOI_TrainNetOrderNo.''; + echo '

      '.$obj->DepartAirport_cn.'('.$obj->DepartureCity.')'.$obj->DepartureTime.' To '.$obj->ArrivalAirport_cn.'('.$obj->ArrivalCity.')'.$obj->ArrivalTime.'

      '; + foreach($juhe_info->passengers as $people){ + echo ''; + echo '

      '.$people->passengersename.'('.$people->piaotypename.') '; + echo $people->cxin.' 票价：￥'.$people->price.'

      '; + echo ''; + } + echo '

      出票成功

      '; + } +?> +

      3. There is no further fee if collect train ticket(s) at the DEPARTURE station shown on your ticket(s). RMB 5 per ticket will be charged at the ticket counter at other stations. Return tickets are treated separately. E.g. if you have booked Beijing-Shanghai and Shanghai-Beijing ticket(s), and you collect them all at Beijing, you will be charged RMB 5 per ticket for the Shanghai-Beijing ticket(s), but if you pick up the return leg ticket(s) separately in Shanghai you will avoid the charge.

      4. Please keep your ticket(s) and don't throw your ticket(s) away once you've boarded your train, you'll need it to exit the station.

      5.Download railway station instructions, maps and tips at https://www.chinahighlights.com/china-trains/station-map.htm

      6.Terms & Conditions. https://www.chinahighlights.com/china-trains/booking-policy.htm

       

      +

      Best Regards!

      Name?>, Travel Advisor

      Tel: tel;?> Mobile: Mobile;?>

      Fax: 86-773-2827424, 86-773-2885308

      E-mail: ;;

      www.chinahighlights.com

      Address: Building 6, Chuangyi Business Park, 70 Qilidian Road, Guilin, Guangxi, 541004, China

      If you wish to share anything with my supervisor (Ms. Alex Yang), please feel free to send your email to alex@chinahighlights.net.

      diff --git a/application/third_party/trainsystem/views/email_fault.php b/application/third_party/trainsystem/views/email_fault.php new file mode 100644 index 00000000..a059912b --- /dev/null +++ b/application/third_party/trainsystem/views/email_fault.php @@ -0,0 +1,26 @@ +

      Dear ,

      Thank you for your booking (order number ), we have received your payment of USDGAI_SQJE?>. 

      Due to the heavy traffic flow of data, the system failed to automatically issue your ticket(s).

      Your travel advisor will purchase your train ticket(s) manually.  You will receive an email within half a working day (Our time now: , , GMT+8).Should you have any questions or concerns with regards to your train booking, please do not hesitate to contact me at ; or telephone tel;?>.

      +'; + echo 'Train No. '; + echo ''.$item->FlightsNo.''; + echo 'Departure '; + echo ''.$item->DepartureTime.', '.$item->DepartureCity.' Station(in Chinese '.$item->DepartAirport_cn.'火车站) '; + echo 'Arrival '.$item->ArrivalTime.', '.$item->ArrivalCity.'(in Chinese'. $item->ArrivalAirport_cn.'火车站)  '; + echo 'Class '.$item->Cabin.''; + echo 'Passenger(s) '; + echo ''; + if($adult>0){echo $adult.' adult(s)
      ';} + if($chlid>0){echo $chlid.' chlid(s)
      ';} + if($baby>0){echo $baby.' baby(s)
      ';} + $i=0; + foreach($allpeople as $item){ + echo ++$i.'.'.$item->BPE_FirstName.$item->BPE_MiddleName.$item->BPE_LastName.' , passport number '.$item->BPE_Passport.'
      '; + } + echo ''; + echo '

      Regards
      '; + echo $operator[0]->Name.'
      Travel Advisor
      '; + echo 'Telephone: (Office)'.$operator[0]->tel.', M: '.$operator[0]->Mobile.','; + echo 'Email: '.$emailarr[0].';'.$emailarr[1].'; 

      '; + }?> + + diff --git a/application/third_party/trainsystem/views/export.php b/application/third_party/trainsystem/views/export.php new file mode 100644 index 00000000..1da65ee6 --- /dev/null +++ b/application/third_party/trainsystem/views/export.php @@ -0,0 +1,110 @@ +
      +
      +
      +

      交易记录导出 订单列表>>

      +
      +
      +
      + " autocomplete="off">至 + " autocomplete="off"> + 审核状态： name="examine" />    + +
      +

      + +

      " style="width:90%;margin:0 auto;"> +
      + + + + + + + $value) {?> + + + + + + +
      时间信息变化值团名外联
      +
      +
      +
      +
      + +
      + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/footer.php b/application/third_party/trainsystem/views/footer.php new file mode 100644 index 00000000..b231b902 --- /dev/null +++ b/application/third_party/trainsystem/views/footer.php @@ -0,0 +1,43 @@ + +
      +
      +
      +
      + +

      {elapsed_time} seconds , {memory_usage} memory ,技术支持:YCC 08987705

      +
      +
      +
      +
      + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/header.php b/application/third_party/trainsystem/views/header.php new file mode 100644 index 00000000..42e3dff2 --- /dev/null +++ b/application/third_party/trainsystem/views/header.php @@ -0,0 +1,156 @@ + + + + + + 信息平台 + + + + + + + + + + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/homepage.php b/application/third_party/trainsystem/views/homepage.php new file mode 100644 index 00000000..832859b3 --- /dev/null +++ b/application/third_party/trainsystem/views/homepage.php @@ -0,0 +1,511 @@ + + +
      +
      +
      +

      翰特订单号 订单列表>>导出交易记录>> 版本：V2.0聚合余额(RMB)：

      +
      +
      +
      + "> + +
      +

      外联：OPI_Name;}?>

      +
      +
      +
      +
      +

      火车订单信息

      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      序号车次座位出发城市抵达城市发车日期发车时间抵达时间票价是否提交过
      train[0]->FlightsNo;?>train[0]->Cabin;?>train[0]->DepartureCity;?>train[0]->ArrivalCity;?>train[0]->DepartureDate;?>train[0]->DepartureTime;?>train[0]->ArrivalTime;?>train[0]->adultcost;?>status)?"否":"是";?>
      + + + + + + + + + + + + people as $key=>$p): ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      序号姓名护照年龄类型
      BPE_FirstName." ".$p->BPE_MiddleName." ".$p->BPE_LastName;?>BPE_Passport;?>BPE_GuestType==1?"成人":($p->BPE_GuestType==2?"儿童":"婴儿");?>
      + train[0]->FlightsNo,0,1); + $arr = array('C','D','G'); + $sel_count = 0; + if(in_array($traintype,$arr)){ + $selectseat = ''; + $train_select = $v->train[0]->FOI_SelectedSeat; + $a1=$b1=$c1=$d1=$f1=$a2=$b2=$c2=$d2=$f2=false; + if($train_select){ + $obj = explode(',',$train_select); + foreach($obj as $value){ + switch($value){ + case '1A': + $a1 = true; + $sel_count++; + break; + case '1B': + $b1 = true; + $sel_count++; + break; + case '1C': + $c1 = true; + $sel_count++; + break; + case '1D': + $d1 = true; + $sel_count++; + break; + case '1F': + $f1 = true; + $sel_count++; + break; + case '2A': + $a2 = true; + $sel_count++; + break; + case '2B': + $b2 = true; + $sel_count++; + break; + case '2C': + $c2 = true; + $sel_count++; + break; + case '2D': + $d2 = true; + $sel_count++; + break; + case '2F': + $f2 = true; + $sel_count++; + break; + } + } + } + $html = ''; + $html .= '
      '.$v->train[0]->Cabin.' for '.$v->train[0]->FlightsNo.' ('.$sel_count.' of '.count($v->people).' Seats)
      '; + $html .= '
      '; + if($a1){ + $html .= ''; + }else{ + $html .= ''; + } + + if($v->train[0]->Aircraft == 'O' || $v->train[0]->Aircraft == '8'){ + if($b1){ + $html .= ''; + }else{ + $html .= ''; + } + + } + if($c1){ + $html .= ''; + }else{ + $html .= ''; + } + + if($v->train[0]->Aircraft != '9'){ + if($d1){ + $html .= ''; + }else{ + $html .= ''; + } + + } + if($f1){ + $html .= ''; + }else{ + $html .= ''; + } + + $html .= '
      '; + $html .= '
      '; + if($a2){ + $html .= ''; + }else{ + $html .= ''; + } + + if($v->train[0]->Aircraft == 'O' || $v->train[0]->Aircraft == '8'){ + if($b2){ + $html .= ''; + }else{ + $html .= ''; + } + + } + if($c2){ + $html .= ''; + }else{ + $html .= ''; + } + + if($v->train[0]->Aircraft != '9'){ + if($d2){ + $html .= ''; + }else{ + $html .= ''; + } + + } + if($f2){ + $html .= ''; + }else{ + $html .= ''; + } + + $html .= '
      '; + + if($v->train[0]->Aircraft != 'F'){ + echo $html; + } + } + ?> +
      + + +
      + + +
      + + + 点击打开配置清单 +

      + + + + + + + + + +
      +
      + +
      +
      +
      + + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/order.php b/application/third_party/trainsystem/views/order.php new file mode 100644 index 00000000..10df6de3 --- /dev/null +++ b/application/third_party/trainsystem/views/order.php @@ -0,0 +1,64 @@ + +
      +
      +
      +

              

      +
      +
      + 1):?> +



      + +

      +

      tst_realname."({$v->tst_identitytype})    {$v->tst_seatstype}  {$v->tst_seatdetail}    票价：￥{$v->tst_ticketprice}";?>

      + + +

      +

      出票成功

      +

      +

      前往退票

      + + + +

      +

      正在处理退票

      +

      查看详情

      + + + +

      +

      +

      查看详情

      + + +

      + +
      +
      +
      + + diff --git a/application/third_party/trainsystem/views/order_list.php b/application/third_party/trainsystem/views/order_list.php new file mode 100644 index 00000000..28108f3a --- /dev/null +++ b/application/third_party/trainsystem/views/order_list.php @@ -0,0 +1,101 @@ +
      +
      +
      +

      订单搜索

      +
      +
      +
      +
      +
      + " autocomplete="off"> +
      +
      + +
      + +
      + +
      +
      +
      +
      +
      +
      +
      +

      订单列表

      +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ts_isauto == 1){ + echo ''; + }elseif($v->ts_isauto == 0){ + echo ''; + }elseif($v->ts_isauto == 3){ + echo ''; + } + ?> + ts_sendmail == 1){ + if($v->ts_m_sn){ + echo ''; + }else{ + echo ''; + } + }else{ + echo ''; + } + ?> + + + + +
      序号汉特订单号(商家订单号)聚合订单号车次出发到达状态价格提交时间所属部门渠道出票方式是否发送邮件操作
      COLI_ID.'('.$v->ts_cold_sn.')';?>ts_ordernumber;?>ts_checi;?>ts_fromstationame;?>ts_tostationame;?>info;?>ts_orderamount;?>ts_subtime;?>COLI_WebCode;?>ts_channel;?>自动手动抢票是是否详情
      +
      +
      +
      +
      \ No newline at end of file diff --git a/application/third_party/trainsystem/views/refund.php b/application/third_party/trainsystem/views/refund.php new file mode 100644 index 00000000..6eeeac99 --- /dev/null +++ b/application/third_party/trainsystem/views/refund.php @@ -0,0 +1,48 @@ +
      +
      +
      +

              

      +
      +
      + '.$from_station_name.''.$to_station_name.'

      '; + echo '

      '; + echo '

      '.$items->tst_realname.'('.$items->tst_ticketype.')    '.$items->tst_seatstype.'  '.$items->tst_seatdetail.'    票价：￥'.$items->tst_ticketprice.'

      '; + if((int)$items->tst_status != 7){ + echo '

      '; + echo '退票'; + echo '

      '; + }else{ + $info = json_decode($items->tst_returncallback); + echo '

      '; + echo ''; + echo '
      退票处理
      '.$items->tst_lasteditdate.'
      '.$msg.'

      '; + } + }?> +
      +
      +
      + \ No newline at end of file diff --git a/application/third_party/trainsystem/views/train_transaction_excel.php b/application/third_party/trainsystem/views/train_transaction_excel.php new file mode 100644 index 00000000..fd45ab3b --- /dev/null +++ b/application/third_party/trainsystem/views/train_transaction_excel.php @@ -0,0 +1,178 @@ + + + + + c21 + c21 + 2016-12-23T01:21:46Z + 2016-12-23T01:38:10Z + 12.00 + + + 9630 + 21555 + 0 + 90 + False + False + + + + + + + + + + + + + + + + + + + + 苏州新科兰德科技有限公司 地址：苏州市园区启月街288号紫金东方307室 联系电话：051262391880 开户银行：浙商银行苏州分行 公司名称：苏州新科兰德科技有限公司 银行账号：3050020010120100129207 跟踪号: + + + + 桂林海纳国际旅行社有限公司火车票对账文件 + + + 时间 + 信息 + 购票人 + 团名 + 变化值 + 最新余额 + + =0;$i--){?> + + + + + + + + + + + 苏州新科兰德科技有限公司©版权所有 苏ICP备14006450号-3 增值电信业务经营许可证：苏B2-20140496 + +
      + + +
      +
      + + + + + + + 3 + 4 + 4 + + + False + False + + + + + +
      + + +
      +
      + + + + False + False + + + + + +
      + + +
      +
      + + + + False + False + + + From 72ab473a8b4d322e2a3dc49c52d2ca2ef77bc9e7 Mon Sep 17 00:00:00 2001 From: cyc Date: Fri, 26 Apr 2019 09:31:45 +0800 Subject: [PATCH 586/596] =?UTF-8?q?=E5=B0=86=E5=80=BC=E7=8F=AD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=92=8Cvalue=E7=B3=BB=E7=BB=9F=E3=80=82=E3=80=82?= =?UTF-8?q?=E4=BB=8E123=E6=90=AC=E8=BF=81=E5=88=B0144?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dingmail/controllers/index.php | 714 ++++++++++++++++++ .../dingmail/models/ding_value_model.php | 334 ++++++++ webht/third_party/dingmail/views/like.php | 212 ++++++ webht/third_party/dingmail/views/login.php | 63 ++ webht/third_party/dingmail/views/mail.php | 552 ++++++++++++++ .../dingmail/views/rank_person.php | 251 ++++++ webht/third_party/dingmail/views/user.php | 258 +++++++ .../workflow/controllers/index.php | 114 ++- .../workflow/models/workflow_model.php | 37 +- .../third_party/workflow/views/form/rota.php | 29 +- .../workflow/views/index/rata_list.php | 9 +- .../workflow/views/index/unverify.php | 68 +- .../workflow/views/index/user_manage.php | 124 ++- .../workflow/views/index/verify.php | 6 +- .../workflow/views/mail_tpl/rota.php | 4 + webht/third_party/workflow/views/w-left.php | 5 +- 16 files changed, 2724 insertions(+), 56 deletions(-) create mode 100644 webht/third_party/dingmail/controllers/index.php create mode 100644 webht/third_party/dingmail/models/ding_value_model.php create mode 100644 webht/third_party/dingmail/views/like.php create mode 100644 webht/third_party/dingmail/views/login.php create mode 100644 webht/third_party/dingmail/views/mail.php create mode 100644 webht/third_party/dingmail/views/rank_person.php create mode 100644 webht/third_party/dingmail/views/user.php 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/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) { + ?>
    • From 21569e4da0657b69a8b0c2a8209a5fc525b4745c Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Apr 2019 11:06:34 +0800 Subject: [PATCH 587/596] =?UTF-8?q?paypal=20Trippest=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E5=8F=91=E9=80=81=E7=8A=B6=E6=80=81=E6=94=B9=E5=88=B0?= =?UTF-8?q?=E5=92=8C=E5=A4=B1=E8=B4=A5=E4=B8=80=E8=B5=B7=E5=A4=84=E7=90=86?= =?UTF-8?q?,=E9=81=BF=E5=85=8D=E5=8D=A1=E4=BD=8F=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/models/note_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webht/third_party/paypal/models/note_model.php b/webht/third_party/paypal/models/note_model.php index c534e41f..0cd9ecd4 100644 --- a/webht/third_party/paypal/models/note_model.php +++ b/webht/third_party/paypal/models/note_model.php @@ -31,14 +31,14 @@ 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(); } From 02b64c677e6356be984c73ba4c12ee6a11fcae10 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Apr 2019 11:07:57 +0800 Subject: [PATCH 588/596] =?UTF-8?q?Alipay=20=E4=BA=A4=E6=98=93=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E7=9A=84=E5=A4=84=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/AlipayTradeService.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/webht/third_party/pay/controllers/AlipayTradeService.php b/webht/third_party/pay/controllers/AlipayTradeService.php index f9db3a3c..9800c519 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -348,7 +348,7 @@ 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; } @@ -359,8 +359,7 @@ class AlipayTradeService extends CI_Controller } //只处理完成状态，其他状态由陆燕处理 - if (strcmp(trim($item->ALI_resultMsg), "TRADE_SUCCESS") - || strcmp(trim($item->ALI_resultMsg), "TRADE_FINISHED")) { + 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; } From 8538378b43f84d5b5609566f16f87c45fefc1030 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Apr 2019 11:09:05 +0800 Subject: [PATCH 589/596] =?UTF-8?q?wxpay=20=E8=87=AA=E5=8A=A8=E5=BD=95?= =?UTF-8?q?=E5=85=A5=E5=92=8C=E5=8F=91=E9=80=81=E6=8F=90=E9=86=92.=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/PaymentService.php | 18 +++++++++--------- .../pay/controllers/WxpayService.php | 2 +- .../pay/models/Online_payment_note_model.php | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index c01d4a43..0e39d8da 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -40,10 +40,6 @@ log_message('error','send_notify begin ----'); } // 开始处理 foreach ($data['unsend_list'] as $key => $item) { - //显示处理记录 - if (empty($transaction_id)) { - echo ++$show_index . ' ' . $item->OPN_transactionId . '
    '; - } // 只处理完成状态 if ($item->OPN_transactionResult != 'completed') { continue; @@ -76,17 +72,17 @@ log_message('error','send_notify begin ----'); // 开始查找订单和录入 $handpick = empty($transaction_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, $item->OPN_accountMethod, mb_strtoupper($item->OPN_currency)); + $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 ( ! isset($advisor_info->ordertype)) { + 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->ordertype == 0) { + if ($advisor_info->order_type == 0) { /* 商务订单 */ if (substr($advisor_info->COLI_WebCode, 0, 6) == 'CHTAPP') { /* APP */ @@ -141,7 +137,7 @@ log_message('error','send_notify begin ----'); $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->ordertype == 1) { + } elseif ($advisor_info->order_type == 1) { /* 传统 */ $gai_sn = $this->account_model->add_tour_account_info( $COLI_SN, @@ -194,8 +190,12 @@ log_message('error','send_notify begin ----'); $this->account_model->save_automail($fromName, $fromEmail, $toName, $toEmail, $subject, $body, $M_RelatedInfo, $M_State, $M_AddTime, 'payment note', 'payment note'); //添加邮件发送记录 end - $this->note_model->update_send($item->OPN_SN, $item->pn_txn_id, 'send'); + $this->note_model->update_send($item->OPN_SN, $item->OPN_transactionId, 'send'); + //显示处理记录 + if (empty($transaction_id)) { + echo ++$show_index . ' ' . $item->OPN_transactionId . '
    '; + } } return; diff --git a/webht/third_party/pay/controllers/WxpayService.php b/webht/third_party/pay/controllers/WxpayService.php index 5f7f8e74..1f39a0ed 100644 --- a/webht/third_party/pay/controllers/WxpayService.php +++ b/webht/third_party/pay/controllers/WxpayService.php @@ -100,7 +100,7 @@ log_message('error','notify begin ----'); return false; } if ($this->make_sign($xml_arr) !== $xml_arr['sign']) { - log_message('error','Wxpay notify error: 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']) { diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index 5d0205e3..e4eefeea 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -35,7 +35,7 @@ class Online_payment_note_model extends CI_Model { //设置订单号 public function set_invoice($id, $pn_invoice) { - $column = array("OPN_orderId" => $send); + $column = array("OPN_orderId" => $pn_invoice); $where = " OPN_SN=" . $id; return $this->update_note($where, $column); } From cf47bc32b911fd2c6cd3c5879a4e98443c9190b2 Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Apr 2019 12:02:10 +0800 Subject: [PATCH 590/596] =?UTF-8?q?paypal=20Trippest=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E7=9A=84=E5=BD=95=E5=85=A5=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/paypal/controllers/index.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index 95d898fa..3c2bdb67 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -1325,6 +1325,9 @@ class Index extends CI_Controller { $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') { @@ -1337,6 +1340,9 @@ class Index extends CI_Controller { 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); } From 9cef2510b497e8c094ca1853bd0081bfa2802aeb Mon Sep 17 00:00:00 2001 From: lyt Date: Fri, 26 Apr 2019 17:28:03 +0800 Subject: [PATCH 591/596] =?UTF-8?q?=E6=94=B6=E6=AC=BE:=E5=A4=96=E8=81=94?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/PaymentService.php | 25 +++++++++++--- .../pay/models/Online_payment_note_model.php | 34 +++++++++---------- webht/third_party/pay/views/mail_advisor.php | 1 + 3 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 webht/third_party/pay/views/mail_advisor.php diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index 0e39d8da..272a86be 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -20,6 +20,24 @@ class PaymentService extends CI_Controller { } + 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']); + } + $this->load->view("iPayLinks_list",$data); + return; + } + public function send_notify($transaction_id=NULL, $old_ssje=NULL) { log_message('error','send_notify begin ----'); @@ -183,7 +201,7 @@ log_message('error','send_notify begin ----'); $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_templete', $item, true); //$item->pn_memo; + $body = $this->load->view('mail_advisor', $item, true); //$item->pn_memo; $M_RelatedInfo = $item->OPN_SN; $M_AddTime = $item->OPN_completeTime; $M_State = 0; @@ -203,6 +221,7 @@ log_message('error','send_notify begin ----'); } /** 支付方式参数对应的配置文件名 */ + /** @Deprecated */ public function method_name($name) { $config_name = 'paypal'; @@ -246,14 +265,12 @@ log_message('error','send_notify begin ----'); 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; diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index e4eefeea..7d5a9c4a 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -40,6 +40,23 @@ class Online_payment_note_model extends CI_Model { 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; @@ -83,23 +100,6 @@ class Online_payment_note_model extends CI_Model { return $this->query_note(); } - 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(); - } - - } 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

    From aecdf6eddf986666a1db385e09c354687184741e Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 29 Apr 2019 11:56:55 +0800 Subject: [PATCH 592/596] =?UTF-8?q?wxpay=20=E6=94=B6=E6=AC=BE=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=A4=84=E7=90=86;=E6=94=B6=E6=AC=BE=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E5=88=97=E8=A1=A8;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/controllers/PaymentService.php | 127 ++++++++++++++++-- .../models/Online_payment_account_model.php | 36 ++++- .../pay/models/Online_payment_note_model.php | 49 ++++++- 3 files changed, 200 insertions(+), 12 deletions(-) diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index 272a86be..bf6180b6 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -1,8 +1,6 @@ note_model->search_date($data['date']); } - $this->load->view("iPayLinks_list",$data); + + /** + * 导出记录用的记录节点 + * TODO + */ + // $data['record_flags'] = $this->note_model->list_export_record(); + + $this->load->view("payment_list",$data); return; } - public function send_notify($transaction_id=NULL, $old_ssje=NULL) + 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($transaction_id)) { - $data['unsend_list'] = $this->note_model->get_note($transaction_id); + if ( ! empty($opn_id)) { + $data['unsend_list'] = $this->note_model->get_note($opn_id); } // 待处理的 if (empty($data['unsend_list'])) { @@ -88,7 +102,7 @@ log_message('error','send_notify begin ----'); } // 开始查找订单和录入 - $handpick = empty($transaction_id) ? false : true; + $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; @@ -207,11 +221,12 @@ log_message('error','send_notify begin ----'); $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($transaction_id)) { + if (empty($opn_id)) { echo ++$show_index . ' ' . $item->OPN_transactionId . '
    '; } @@ -278,5 +293,99 @@ log_message('error','send_notify begin ----'); 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/models/Online_payment_account_model.php b/webht/third_party/pay/models/Online_payment_account_model.php index 3a42e20e..91fc6fa0 100644 --- a/webht/third_party/pay/models/Online_payment_account_model.php +++ b/webht/third_party/pay/models/Online_payment_account_model.php @@ -28,7 +28,7 @@ class Online_payment_account_model extends CI_Model { $result = ''; $fieldsql = $orderinfo == false ? '' : " ,* "; //先查商务订单B,APP订单A、再查传统订单T - if ($ordertype == 'B' || $ordertype == 'A') { + 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 =?"; @@ -152,6 +152,40 @@ class Online_payment_account_model extends CI_Model { 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) { //先判断是否有这条数据 diff --git a/webht/third_party/pay/models/Online_payment_note_model.php b/webht/third_party/pay/models/Online_payment_note_model.php index 7d5a9c4a..c17f0cb4 100644 --- a/webht/third_party/pay/models/Online_payment_note_model.php +++ b/webht/third_party/pay/models/Online_payment_note_model.php @@ -92,14 +92,59 @@ class Online_payment_note_model extends CI_Model { return $query->result(); } - public function get_note($transactionId) + public function get_note($opn_id) { $this->init_query(); $this->topnum=1; - $this->transactionId = " AND opn.OPN_transactionId=" . $this->info->escape($transactionId); + $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(); + } + } From ef7df5607005e47916b2fb63c316fc819d908b38 Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 29 Apr 2019 13:30:54 +0800 Subject: [PATCH 593/596] =?UTF-8?q?wxpay=20=E6=96=B0=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/webht/flatpicker.min.css | 3 + js/flatpickr-4.4.4.min.js | 2 + .../pay/views/payment_gai_setting.php | 59 ++++ webht/third_party/pay/views/payment_list.php | 303 ++++++++++++++++++ 4 files changed, 367 insertions(+) create mode 100644 css/webht/flatpicker.min.css create mode 100644 js/flatpickr-4.4.4.min.js create mode 100644 webht/third_party/pay/views/payment_gai_setting.php create mode 100644 webht/third_party/pay/views/payment_list.php 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/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() + +

    已录入订单

    + + + + + + + $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; ?> + +
    +
    + +
    +
    +
    + + + + + + From 5a639a518fd479437c7d64404cadf511f06c9133 Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 29 Apr 2019 16:15:12 +0800 Subject: [PATCH 594/596] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=87=BA=E7=A5=A8=E7=AB=99=E7=82=B9=E3=80=82=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=85=A5=E5=BA=93=E6=94=AF=E4=BB=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/third_party/trainsystem/controllers/check.php | 2 +- .../third_party/trainsystem/models/BIZ_train_model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/third_party/trainsystem/controllers/check.php b/application/third_party/trainsystem/controllers/check.php index 0344df4d..49f0d110 100644 --- a/application/third_party/trainsystem/controllers/check.php +++ b/application/third_party/trainsystem/controllers/check.php @@ -393,7 +393,7 @@ class check extends CI_Controller{ }*/ //调试代码 - $test_post = '{"data":"{\"from_station_name\":\"\u5317\u4eac\u5357\",\"from_station_code\":\"VNP\",\"to_station_name\":\"\u4e0a\u6d77\u8679\u6865\",\"to_station_code\":\"AOH\",\"train_date\":\"2019-05-08\",\"orderid\":\"JH155489661120411\",\"user_orderid\":\"488128168\",\"orderamount\":\"3496.00\",\"ordernumber\":\"EE79032518\",\"checi\":\"G43\",\"msg\":\"\u7ebf\u4e0a\u9000\u7968\u6210\u529f\",\"status\":\"7\",\"passengers\":[{\"passengerid\":1,\"passengersename\":\"WEISIGKOLIVER\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CAYLW9WTT\",\"price\":\"1748.0\",\"zwcode\":\"9\",\"zwname\":\"\u5546\u52a1\u5ea7\",\"ticket_no\":\"EE79032518103005A\",\"cxin\":\"03\u8f66\u53a2,05A\u5ea7\",\"reason\":0,\"refundTimeline\":[{\"time\":\"2019-04-11 11:46:10\",\"msg\":\"\u7ebf\u4e0a\u7533\u8bf7\u9000\u7968\"},{\"time\":\"2019-04-11 11:46:41\",\"msg\":\"\u7ebf\u4e0a\u9000\u7968\u6210\u529f\",\"detail\":{\"returnsuccess\":true,\"returnmoney\":\"1748\",\"returnfailid\":\"\",\"returnfailmsg\":\"\",\"returntype\":\"1\",\"ticket_no\":\"EE79032518103005A\",\"passengername\":\"WEISIGKOLIVER\",\"passporttypeseid\":\"B\",\"passportseno\":\"CAYLW9WTT\"}}],\"returntickets\":{\"returnsuccess\":true,\"returnmoney\":\"1748\",\"returntime\":\"2019-04-11 11:46:39\",\"returnfailid\":\"\",\"returnfailmsg\":\"\",\"returntype\":\"1\"}},{\"passengerid\":2,\"passengersename\":\"ALBERTSTEFANIECAROLINDOROTHEE\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"CAYLM2751\",\"price\":\"1748.0\",\"zwcode\":\"9\",\"zwname\":\"\u5546\u52a1\u5ea7\",\"ticket_no\":\"EE79032518103005C\",\"cxin\":\"03\u8f66\u53a2,05C\u5ea7\",\"reason\":0,\"refundTimeline\":[{\"time\":\"2019-04-11 11:46:12\",\"msg\":\"\u7ebf\u4e0a\u7533\u8bf7\u9000\u7968\"}]}],\"refund_money\":\"1748.00\",\"sign\":\"f077215579ecd5c130d39b502c9bd055\"}"}'; + $test_post = '{"data":"{\"from_station_name\":\"\u5e7f\u5dde\u5357\",\"from_station_code\":\"IZQ\",\"to_station_name\":\"\u9999\u6e2f\u897f\u4e5d\u9f99\",\"to_station_code\":\"XJA\",\"train_date\":\"2019-04-29\",\"orderid\":\"JH155651319519711\",\"user_orderid\":\"488132483\",\"orderamount\":\"374.00\",\"ordernumber\":\"E244376926\",\"checi\":\"G6537\",\"msg\":\"\u51fa\u7968\u6210\u529f\",\"status\":\"4\",\"passengers\":[{\"passengerid\":1,\"passengersename\":\"PRIETORAMOSJORGECLAUDIO\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"AAC408307\",\"price\":\"187.0\",\"zwcode\":\"O\",\"zwname\":\"\u4e8c\u7b49\u5ea7\",\"ticket_no\":\"E244376926111013D\",\"cxin\":\"11\u8f66\u53a2,13D\u5ea7\",\"reason\":0},{\"passengerid\":2,\"passengersename\":\"SALAZARNATALIAGISELA\",\"piaotype\":\"1\",\"piaotypename\":\"\u6210\u4eba\u7968\",\"passporttypeseid\":\"B\",\"passporttypeseidname\":\"\u62a4\u7167\",\"passportseno\":\"AAC419811\",\"price\":\"187.0\",\"zwcode\":\"O\",\"zwname\":\"\u4e8c\u7b49\u5ea7\",\"ticket_no\":\"E244376926111013F\",\"cxin\":\"11\u8f66\u53a2,13F\u5ea7\",\"reason\":0}],\"refund_money\":null,\"sign\":\"831c146e2ce223a5437ed78db0ec8c25\"}"}'; $data_post["data"] = json_decode($test_post)->data; diff --git a/application/third_party/trainsystem/models/BIZ_train_model.php b/application/third_party/trainsystem/models/BIZ_train_model.php index bd392858..d6401575 100644 --- a/application/third_party/trainsystem/models/BIZ_train_model.php +++ b/application/third_party/trainsystem/models/BIZ_train_model.php @@ -240,7 +240,7 @@ class BIZ_train_model extends CI_Model { TOC_WL, TOC_OtherCost ) - VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT COLI_OPI_ID FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1)"; + VALUES(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),null),(?,getdate(),{$CCSN},?,?,?,?,(SELECT isnull(COLI_OPI_ID,29) FROM BIZ_ConfirmLineInfo WHERE COLI_SN={$CCSN}),1)"; $query = $this->HT->query($sql,array($data->TOC_COLD_SN,"%".$data->TOC_Memo."%",$data->TOC_Memo,$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->TOC_TicketCost,$data->TOC_Memo." 手续费",$data->TOC_COLD_SN,$data->TOC_TrainNumber,$data->TOC_DepartureDate,$data->poundage)); } return $query; @@ -260,7 +260,7 @@ class BIZ_train_model extends CI_Model { ON bcli.COLI_SN = bgai.GAI_COLI_SN WHERE bcli.COLI_ServiceType = '2' AND bcli.COLI_State in ('11','13','8','63') - AND bcli.COLI_WebCode in ('cht', 'JP', 'train_it', 'VC', 'train_ru','GM-Train','SHT','CT') + AND bcli.COLI_WebCode in ('cht', 'JP', 'train_it', 'VC', 'train_ru','GM-Train','SHT','CT','WebMob-biz','WeChat-biz') AND (bcli.COLI_Price - bgai.GAI_SQJE) <= 20 AND (bcli.COLI_Price - bgai.GAI_SQJE) >= 0 AND bcli.DeleteFlag = 0 From 7b5ff8a08fa351e4ba323b2d4230518c2a7e72df Mon Sep 17 00:00:00 2001 From: cyc Date: Mon, 29 Apr 2019 17:05:00 +0800 Subject: [PATCH 595/596] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=92=8C=E8=AE=A2=E5=8D=95=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ctrip/controllers/ctrip_train.php | 24 +++ .../tripadvisor_spider/config/config.php | 6 +- .../tripadvisor_spider/controllers/index.php | 158 ++++++++++++++- .../messagecenter/controllers/index.php | 183 ++++++++++++++++++ .../messagecenter/helpers/message_helper.php | 31 +++ .../messagecenter/views/message_index.php | 52 +++++ .../ordersfrom/controllers/index.php | 81 ++++++++ .../ordersfrom/models/ordersfrom_model.php | 45 +++++ .../ordersfrom/views/ah_orders.php | 62 ++++++ webht/third_party/ordersfrom/views/index.php | 120 ++++++++++++ 10 files changed, 760 insertions(+), 2 deletions(-) create mode 100644 webht/third_party/messagecenter/controllers/index.php create mode 100644 webht/third_party/messagecenter/helpers/message_helper.php create mode 100644 webht/third_party/messagecenter/views/message_index.php create mode 100644 webht/third_party/ordersfrom/controllers/index.php create mode 100644 webht/third_party/ordersfrom/models/ordersfrom_model.php create mode 100644 webht/third_party/ordersfrom/views/ah_orders.php create mode 100644 webht/third_party/ordersfrom/views/index.php diff --git a/application/third_party/ctrip/controllers/ctrip_train.php b/application/third_party/ctrip/controllers/ctrip_train.php index 7f818f37..1836268e 100644 --- a/application/third_party/ctrip/controllers/ctrip_train.php +++ b/application/third_party/ctrip/controllers/ctrip_train.php @@ -123,6 +123,12 @@ class ctrip_train extends CI_Controller{ $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.'",'; @@ -167,6 +173,12 @@ class ctrip_train extends CI_Controller{ $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; @@ -175,6 +187,7 @@ class ctrip_train extends CI_Controller{ $PriceStr = $SeaType.'"train_no":'.'"'.$TrainInfo->TrainNo.'"'; } + //对返回的数据进行容错处理 $gjrwNum = isset($gjrwNum) ? ticket_exchange($gjrwNum,$iseven) : ''; $rwNum = isset($rwNum) ? ticket_exchange($rwNum,$iseven) : ''; @@ -187,6 +200,17 @@ class ctrip_train extends CI_Controller{ $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; diff --git a/application/third_party/tripadvisor_spider/config/config.php b/application/third_party/tripadvisor_spider/config/config.php index b76a507d..022d61f8 100644 --- a/application/third_party/tripadvisor_spider/config/config.php +++ b/application/third_party/tripadvisor_spider/config/config.php @@ -17,7 +17,11 @@ $config['tripadvisor_website'] = array( 'Lijiang' => 'http://www.tripadvisor.com/Attraction_Review-g303783-d8464335-Reviews{PAGENUM}China_Highlights_Lijiang-Lijiang_Yunnan.html', 'Zhangjiajie' => 'http://www.tripadvisor.com/Attraction_Review-g494933-d8077695-Reviews{PAGENUM}China_Highlights_Zhangjiajie_Day_Tour-Zhangjiajie_Hunan.html', 'HongKong' => 'https://www.tripadvisor.com/Attraction_Review-g294217-d10243951-Reviews{PAGENUM}China_Highlights_Hong_Kong-Hong_Kong.html', - 'Panda' => 'https://www.tripadvisor.com/Attraction_Review-g297463-d11489225-Reviews{PAGENUM}China_Highlights-Chengdu_Sichuan.html' + 'Panda' => 'https://www.tripadvisor.com/Attraction_Review-g297463-d11489225-Reviews{PAGENUM}China_Highlights-Chengdu_Sichuan.html', + 'tp_Beijing' => 'https://www.tripadvisor.com/Attraction_Review-g294212-d4006739-Reviews-The_Trippest_Mini_Group_Tours-Beijing.html', + 'tp_Xian' => 'https://www.tripadvisor.com/Attraction_Review-g298557-d10999897-Reviews-Xi_an_Trippest_Mini_Group_Tours-Xi_an_Shaanxi.html', + 'tp_Shanghai' => 'https://www.tripadvisor.com/Attraction_Review-g308272-d6222868-Reviews-Shanghai_Trippest_Mini_Group_Tours-Shanghai.html', + 'tp_Guilin' => 'https://www.tripadvisor.com/Attraction_Review-g298556-d14121459-Reviews-Trippest_Mini_Group_Tours-Guilin_Guangxi.html' ); diff --git a/application/third_party/tripadvisor_spider/controllers/index.php b/application/third_party/tripadvisor_spider/controllers/index.php index e2dee812..6bc23ea5 100644 --- a/application/third_party/tripadvisor_spider/controllers/index.php +++ b/application/third_party/tripadvisor_spider/controllers/index.php @@ -11,6 +11,11 @@ class Index extends CI_Controller { public function __construct() { parent::__construct(); //$this->output->enable_profiler(TRUE); + header('Access-Control-Allow-Origin:*'); + header('Access-Control-Allow-Methods:POST, GET'); + header('Access-Control-Max-Age:0'); + header('Access-Control-Allow-Headers:x-requested-with, Content-Type'); + header('Access-Control-Allow-Credentials:true'); $this->load->model('Tripadvisor_Review_model'); } @@ -186,5 +191,156 @@ class Index extends CI_Controller { } echo json_encode(array('group_result' => $this->load->view('find_group_result', $data, true), 'tr_content' => $data['ta_review']->tr_content)); } - + + //第三方数据导入 + public function third_party_input(){ + $this->load->view('bootstrap3/header'); + $this->load->view('third_party_input'); + $this->load->view('bootstrap3/footer'); + } + + function ensure_writable_dir($dir) { + if(!file_exists($dir)) { + mkdir($dir, 0766, true); + chmod($dir, 0766); + chmod($dir, 0777); + }else if(!is_writable($dir)) { + chmod($dir, 0766); + chmod($dir, 0777); + if(!is_writable($dir)) { + throw new FileSystemException("目录 $dir 不可写"); + } + } + } + + //第三方数据录入 + public function analysis_excel(){ + $filename = date('Y').date('m').date('d').date('h').date('i').date('s').'.'.explode('.',$_FILES['fileArray']['name'])[1]; + $tmp = $_FILES['fileArray']['tmp_name']; + $error = $_FILES['fileArray']['error']; + if($error > 0){ + header("HTTP/1.1 404 Not Found"); + echo '{"status":404,"message":'.$_FILES["fileArray"]["error"].'}'; + }else{ + $path = 'upload/'.date('Y').'/'.date('m').'/'; + $this->ensure_writable_dir($path); + if(move_uploaded_file($tmp,$path.$filename)){ + require_once "PHPExcel/IOFactory.php"; + $phpExcel = PHPExcel_IOFactory::load($path.$filename); + + //创建返回的数组 + $data = []; + foreach ($phpExcel->getSheetNames() as $key=>$destination){ + $data[$key] = new stdClass(); + $data[$key]->destination = $destination; + $data[$key]->list_name = array(); + $data[$key]->list_data = array(); + //循环获取每个表格的行/列数 + $row = $phpExcel->getActiveSheet()->getHighestRow(); + $column = $phpExcel->getActiveSheet()->getHighestColumn(); + $j = 0; + // 行数循环 + for ($i = 1; $i <= $row; $i++) { + // 列数循环 + for ($c = 'A'; $c <= $column; $c++) { + if($phpExcel->getActiveSheet($key)->getCell('A' . $i)->getValue() == ''){ + continue; + }else{ + if($i == 1){ + array_push($data[$key]->list_name,$phpExcel->getActiveSheet($key)->getCell($c . $i)->getValue()); + }else{ + $data[$key]->list_data[$j][] = $phpExcel->getActiveSheet($key)->getCell($c . $i)->getValue(); + } + + } + } + $j++; + } + } + //返回处理完后的json + print_r(json_encode($data)); + }else{ + header("HTTP/1.1 404 Not Found"); + echo '{"status":404,"message":"文件上传失败！","picname":""}'; + } + } + } + + public function get_destination_reviews($destination = null){ + $ta_website = $this->config->item('tripadvisor_website'); + + //根据传入的目的地简码获取TA的相应评论列表 + if(isset($ta_website[$destination])){ + $url = $ta_website[$destination]; + + //根据url获取页面内容 + $content = GET_HTTP($url); + + //进行页面解析 + $html_object = str_get_html($content); + + //获取第一页列表上的url + foreach ($html_object->find('.reviewSelector .quote a') as $a_info){ + $url = 'https://www.tripadvisor.com'.$a_info->href; + + } + } + } + + function get_reviews_detail(){ + set_time_limit(0); + $url = $this->input->get_post('url'); + $destination = $this->input->get_post('destination'); + + //$url = 'https://www.tripadvisor.com/ShowUserReviews-g294212-d4006739-r666168101-The_Trippest_Mini_Group_Tours-Beijing.html'; + $destination = 'tp_Beijing'; + + if($url != ''){ + $content = GET_HTTP($url); + $html_object = str_get_html($content); + + //做一个数组用于存储数据 + $detail_data = new stdClass(); + $detail_data->destination = $destination; + + //提取局部,不做整个页面的寻找元素,提升效率 + $meta_inner = $html_object->find('.meta_inner'); + + foreach($meta_inner as $detail_info){ + //获取评论者帐号 + foreach($detail_info->find('.info_text') as $review_name){ + $detail_data->review_name = $review_name->first_child()->innertext; + } + + //获取评论者ID + foreach($detail_info->find('.reviewSelector') as $review_id){ + $detail_data->review_id = str_replace('review_','',$review_id->id); + } + + //获取标题 + foreach($detail_info->find('#HEADING') as $title){ + $detail_data->title = $title->innertext; + } + + //获取星级 + foreach($detail_info->find('.ui_bubble_rating') as $star_nums){ + $detail_data->star_nums = str_replace('ui_bubble_rating ','',$star_nums->getAttribute('class')); + $detail_data->star_nums = str_replace(array('bubble_50','bubble_40','bubble_30','bubble_20'),array(5,4,3,2),$detail_data->star_nums); + } + + //获取评论内容 + foreach($detail_info->find('.partial_entry .fullText') as $content){ + $detail_data->content = $content->innertext; + } + + //获取评论时间 + foreach($detail_info->find('.prw_reviews_stay_date_hsx') as $review_date){ + $detail_data->review_date = str_replace('Date of experience: ','',$review_date->innertext); + } + } + + //拿到数据后进行入库 + print_r(json_encode($detail_data)); + } + } } 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 From 477fa683ed12d7728f0bc3102f1b0c878a1158ab Mon Sep 17 00:00:00 2001 From: lyt Date: Mon, 29 Apr 2019 17:09:54 +0800 Subject: [PATCH 596/596] =?UTF-8?q?=E4=BB=8E123=E6=90=AC=E8=BF=81=E7=9A=84?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=9C=80=E6=B1=82=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/controllers/demandform.php | 167 ++++++++++++++++ webht/models/demandform_model.php | 119 +++++++++++ webht/views/demandform/index.php | 160 +++++++++++++++ webht/views/demandform/index1.php | 315 ++++++++++++++++++++++++++++++ webht/views/demandform/reply.php | 122 ++++++++++++ 5 files changed, 883 insertions(+) create mode 100644 webht/controllers/demandform.php create mode 100644 webht/models/demandform_model.php create mode 100644 webht/views/demandform/index.php create mode 100644 webht/views/demandform/index1.php create mode 100644 webht/views/demandform/reply.php 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/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; ?>

    + +
    + + +
    + + +