From 97d27ba0d28912bedf6b2e2c2e9cb51557d16ae6 Mon Sep 17 00:00:00 2001 From: cyc Date: Tue, 21 May 2019 14:00:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=92=89=E9=92=89?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=AA=8C=E8=AF=81=EF=BC=8C=E9=92=89=E9=92=89?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trainsystem/controllers/pages.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/application/third_party/trainsystem/controllers/pages.php b/application/third_party/trainsystem/controllers/pages.php index 77f0edca..c7a86c6d 100644 --- a/application/third_party/trainsystem/controllers/pages.php +++ b/application/third_party/trainsystem/controllers/pages.php @@ -13,9 +13,9 @@ class pages extends CI_Controller{ } public function index($coli_id = null){ - if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ dingLogin(); - } + }*/ if($coli_id == null){ $cols_id = $this->input->post("ht_order"); }else{ @@ -54,9 +54,9 @@ class pages extends CI_Controller{ //系统列表页面 public function order_list(){ - if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ dingLogin(); - } + }*/ $page_size = 10; $page = $this->input->get("page"); $order = $this->input->get("order"); @@ -110,9 +110,9 @@ class pages extends CI_Controller{ //订单详情页面 public function order(){ - if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ dingLogin(); - } + }*/ $ordernumber = $order=$this->input->get("order"); if(empty($ordernumber)){ @@ -159,9 +159,9 @@ class pages extends CI_Controller{ //退票页面 public function refund(){ - if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ dingLogin(); - } + }*/ $ordernumber = $order=$this->input->get("order"); if(empty($ordernumber)){ @@ -198,9 +198,9 @@ class pages extends CI_Controller{ } public function export(){ - if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ + /*if($this->session->userdata('dingname') == '' && $this->session->userdata('dingunionid') == ''){ dingLogin(); - } + }*/ $this->load->view('header'); $this->load->view('export'); $this->load->view('footer'); From 74ba1e15187bb94ade427bdb19830d6b6833a878 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 21 May 2019 14:01:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=80=E6=AC=BE=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E5=A2=9E=E5=8A=A0=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webht/third_party/pay/controllers/PaymentService.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/webht/third_party/pay/controllers/PaymentService.php b/webht/third_party/pay/controllers/PaymentService.php index aecb8887..01bf18c2 100644 --- a/webht/third_party/pay/controllers/PaymentService.php +++ b/webht/third_party/pay/controllers/PaymentService.php @@ -413,6 +413,7 @@ log_message('error','send_notify begin ----'); $objPHPExcel->getActiveSheet()->getColumnDimension('H')->setWidth(30); // 邮箱 $objPHPExcel->getActiveSheet()->getColumnDimension('I')->setWidth(20); // 交易号 $objPHPExcel->getActiveSheet()->getColumnDimension('J')->setWidth(20); // 时间 + $objPHPExcel->getActiveSheet()->getColumnDimension('K')->setWidth(20); // 交易平台 // 对齐 $objPHPExcel->getActiveSheet()->getStyle('D')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); $objPHPExcel->getActiveSheet()->getStyle('F')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); @@ -427,7 +428,9 @@ log_message('error','send_notify begin ----'); ->SetCellValue('G1', '付款人') ->SetCellValue('H1', '邮箱') ->SetCellValue('I1', '交易号') - ->SetCellValue('J1', '时间'); + ->SetCellValue('J1', '时间') + ->SetCellValue('K1', '交易平台') + ; $currency_sum = array(); bcscale(2); $rowCount = 2; @@ -442,7 +445,9 @@ log_message('error','send_notify begin ----'); ->SetCellValue('G'.$rowCount, $row['payer']) ->SetCellValue('H'.$rowCount, $row['payer_email']) ->setCellValueExplicit('I'.$rowCount, $row['transaction_id'], PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('J'.$rowCount, $row['payment_date']); + ->SetCellValue('J'.$rowCount, $row['payment_date']) + ->SetCellValue('K'.$rowCount, $row['payment_type']) + ; $rowCount++; } $time_set = date('Y-m-d_H_i_s'); From 108541cbf699a02489963cd52ee4d57afb4e24f8 Mon Sep 17 00:00:00 2001 From: lyt Date: Tue, 21 May 2019 18:08:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?Alipay=E8=8E=B7=E5=8F=96=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E4=B8=8B=E8=BD=BD=E5=9C=B0=E5=9D=80?= 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 6bd08c44..173346c2 100644 --- a/webht/third_party/pay/controllers/AlipayTradeService.php +++ b/webht/third_party/pay/controllers/AlipayTradeService.php @@ -780,9 +780,10 @@ class AlipayTradeService extends CI_Controller public function get_billfile($date=NULL) { $request = new AlipayDataDataserviceBillDownloadurlQueryRequest(); + $date = $date===NULL ? "2019-05-16" : $date; $request->setBizContent("{" . "\"bill_type\":\"signcustomer\"," . - "\"bill_date\":\"2019-04-25\"" . + "\"bill_date\":\"$date\"" . "}"); $response = $this->aopclientRequestExecute ($request); // var_dump($response);