diff --git a/webht/third_party/pay/controllers/iPayLinksService.php b/webht/third_party/pay/controllers/iPayLinksService.php index d8820bc3..c7ad49ba 100644 --- a/webht/third_party/pay/controllers/iPayLinksService.php +++ b/webht/third_party/pay/controllers/iPayLinksService.php @@ -1235,6 +1235,7 @@ class IPayLinksService extends CI_Controller $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(20); $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(30); $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); // 对齐 $objPHPExcel->getActiveSheet()->getStyle('B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); $objPHPExcel->getActiveSheet()->getStyle('C')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); @@ -1244,8 +1245,9 @@ class IPayLinksService extends CI_Controller ->SetCellValue('B1', '团号') ->SetCellValue('C1', '金额') ->SetCellValue('D1', '付款人') - ->SetCellValue('E1', '交易号') - ->SetCellValue('F1', '收单时间'); + ->SetCellValue('E1', '付款人邮箱') + ->SetCellValue('F1', '交易号') + ->SetCellValue('G1', '收单时间'); $currency_sum = array(); bcscale(2); $rowCount = 2; @@ -1258,9 +1260,10 @@ class IPayLinksService extends CI_Controller ->SetCellValue('A'.$rowCount, ($rowCount-1)) ->setCellValueExplicit('B'.$rowCount, $row->IPL_orderId,PHPExcel_Cell_DataType::TYPE_STRING) ->setCellValueExplicit('C'.$rowCount, trim($row->IPL_currencyCode) . number_format($row->IPL_orderAmount, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('D'.$rowCount, $payer) - ->setCellValueExplicit('E'.$rowCount, $row->IPL_dealId,PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('F'.$rowCount, $row->IPL_acquiringTime); + ->SetCellValue('D'.$rowCount, $row->IPL_payerName) + ->SetCellValue('E'.$rowCount, $row->IPL_payerEmail) + ->setCellValueExplicit('F'.$rowCount, $row->IPL_dealId,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('G'.$rowCount, $row->IPL_acquiringTime); $payer = ""; $rowCount++; } diff --git a/webht/third_party/paypal/controllers/index.php b/webht/third_party/paypal/controllers/index.php index e7f4b9be..6c466f89 100644 --- a/webht/third_party/paypal/controllers/index.php +++ b/webht/third_party/paypal/controllers/index.php @@ -980,6 +980,7 @@ class Index extends CI_Controller { $objPHPExcel->getActiveSheet()->getColumnDimension('D')->setWidth(20); $objPHPExcel->getActiveSheet()->getColumnDimension('E')->setWidth(30); $objPHPExcel->getActiveSheet()->getColumnDimension('F')->setWidth(20); + $objPHPExcel->getActiveSheet()->getColumnDimension('G')->setWidth(20); // 对齐 $objPHPExcel->getActiveSheet()->getStyle('B')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_LEFT); $objPHPExcel->getActiveSheet()->getStyle('C')->getAlignment()->setHorizontal(PHPExcel_Style_Alignment::HORIZONTAL_RIGHT); @@ -989,8 +990,9 @@ class Index extends CI_Controller { ->SetCellValue('B1', '团号') ->SetCellValue('C1', '金额') ->SetCellValue('D1', '付款人') - ->SetCellValue('E1', '交易号') - ->SetCellValue('F1', '收单时间'); + ->SetCellValue('E1', '付款人邮箱') + ->SetCellValue('F1', '交易号') + ->SetCellValue('G1', '收单时间'); $currency_sum = array(); bcscale(2); $rowCount = 2; @@ -1004,9 +1006,10 @@ class Index extends CI_Controller { ->SetCellValue('A'.$rowCount, ($rowCount-1)) ->setCellValueExplicit('B'.$rowCount, $orderid,PHPExcel_Cell_DataType::TYPE_STRING) ->setCellValueExplicit('C'.$rowCount, trim($row->pn_mc_currency) . number_format($row->pn_mc_gross, 2, ".", ""),PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('D'.$rowCount, $payer) - ->setCellValueExplicit('E'.$rowCount, $row->pn_txn_id,PHPExcel_Cell_DataType::TYPE_STRING) - ->SetCellValue('F'.$rowCount, $row->pn_datetime); + ->SetCellValue('D'.$rowCount, $row->pn_payer) + ->SetCellValue('E'.$rowCount, $row->pn_payer_email) + ->setCellValueExplicit('F'.$rowCount, $row->pn_txn_id,PHPExcel_Cell_DataType::TYPE_STRING) + ->SetCellValue('G'.$rowCount, $row->pn_datetime); $payer = $orderid = ""; $rowCount++; }