Merge branch 'master' of https://gitee.com/hainatravel/information-system

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'); 

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);

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');