From 64e2517b937b7df18dc0d100674054c74fe8ecae Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 2 Sep 2020 11:45:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/FinanceController.class.php | 23 +++++++++++++++++++ .../Admin/View/Finance/payTypeStatistics.html | 4 ++-- Application/Admin/View/PayChannel/index.html | 8 +++---- Application/Admin/View/PayMerchant/index.html | 4 ++-- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 516b47bb0..4ecf1027c 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1388,6 +1388,29 @@ class FinanceController extends ThinkController $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值 } + $testOrderData = M('test_order', 'tab_') + ->where([ + 'pay_way'=>['egt',1], + 'pay_time'=>$time + ]) + ->field('pay_way,sum(pay_amount) as pay_amount') + ->group("pay_way") + ->select(); + foreach ($testOrderData as $key => $value) { + + if ($value['pay_way'] == NULL&&$value['pay_amount'] == NULL) { + continue; + } + + if (!array_key_exists($value['pay_way'], $cashStatistics)) { + $cashStatistics[$value['pay_way']] = $value; + $cashStatistics[$value['pay_way']]['pay_type'] = getPayType($value['pay_way']);//充值方式文字影视 + $cashStatistics[$value['pay_way']]['pay_amount'] = '0.00'; + $cashStatistics[$value['pay_way']]['balance'] = 0;//别表的平台币充值 + } + $cashStatistics[$value['pay_way']]['balance'] += $value['pay_amount'];//别表的平台币充值 + } + foreach ($cashStatistics as $key => $value) { $cashStatistics[$key]['pay_rate'] = ''; $cashStatistics[$key]['total'] = $value['pay_amount'] + $value['balance'];//添加列表合计 diff --git a/Application/Admin/View/Finance/payTypeStatistics.html b/Application/Admin/View/Finance/payTypeStatistics.html index a4ec034f3..0febbec2f 100644 --- a/Application/Admin/View/Finance/payTypeStatistics.html +++ b/Application/Admin/View/Finance/payTypeStatistics.html @@ -71,12 +71,12 @@
-

{$_REQUEST['count_date']}平台统计

+

{$_REQUEST['count_date']}充值方式统计

游戏充值统计 充值方式统计 - 支付方式统计 + 支付商户统计
diff --git a/Application/Admin/View/PayChannel/index.html b/Application/Admin/View/PayChannel/index.html index b702c54b0..b45ad9642 100644 --- a/Application/Admin/View/PayChannel/index.html +++ b/Application/Admin/View/PayChannel/index.html @@ -70,12 +70,12 @@
-

支付渠道统计

+

游戏充值统计

说明：平台币直充金额2019.12.18以前sdk新包数据及sdk旧包数据，无法对应相关游戏无法计入以上平台币列表中，充值方式统计一栏统计平台币直充总金额

游戏充值统计 充值方式统计 - 支付方式统计 + 支付商户统计
@@ -252,7 +252,7 @@ 平台币直充总金额(2019.12.18号以前的无法对应游戏记录不显示在列表中，此项也不计入充值方式统计)：{$coinSum}0.00 - + 支付渠道 @@ -260,7 +260,7 @@ - + 支付渠道占比 diff --git a/Application/Admin/View/PayMerchant/index.html b/Application/Admin/View/PayMerchant/index.html index ce401e232..8b28cb7e4 100644 --- a/Application/Admin/View/PayMerchant/index.html +++ b/Application/Admin/View/PayMerchant/index.html @@ -70,12 +70,12 @@
-

支付方式统计

+

支付商户统计

游戏充值统计 充值方式统计 - 支付方式统计 + 支付商户统计
From c0406a6f5287ab6149b6b834d8364c15f7afbba7 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 3 Sep 2020 11:16:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8A=E6=B8=B8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...regateFinanceStatementController.class.php | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php index 3a71b06a4..e7860a83e 100644 --- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php +++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php @@ -611,6 +611,96 @@ class AggregateFinanceStatementController extends ThinkController $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+8), $first_data);//户名 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行 + if($data['withdraw_type'] == 1){ + $m = date('Y.m', $data['begintime']); + $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$m}"; + }else{ + $fileName = "{$data['second_party_info']['partner']}&{$data['first_party_info']['partner']}-对账单{$statement_begin_time}-{$statement_end_time}"; + } + ob_end_clean();//清除缓冲区,避免乱码 + header('pragma:public'); + header('Content-type:application/vnd.ms-excel;charset=utf-8;name="' . $fileName .'".xls'); + header("Content-Disposition:attachment;filename={$fileName}.xls");//attachment新窗口打印inline本窗口打印 + $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5'); + $objWriter->save('php://output'); + } + public function excelDownStreamPersonTemplate($data,$big_all_sum_money) { + + header("Content-type: text/html; charset=utf-8"); + error_reporting(E_ALL); + ini_set('display_errors', TRUE); + ini_set('display_startup_errors', TRUE); + + define('EOL',(PHP_SAPI == 'cli') ? PHP_EOL : '
'); + + date_default_timezone_set('Asia/Shanghai'); + Vendor("PHPExcel.PHPExcel"); + $objPHPExcel = new \PHPExcel(); + $objReader = \PHPExcel_IOFactory::createReader('Excel5'); + //设置模板文件 + $objPHPExcel = $objReader->load("Public/Admin/excel/aggregate_stream.xls"); + $statement_begin_time = date('Y.m.d', $data['begintime']);//对账开始时间 + $statement_end_time = date('Y.m.d',$data['endtime']);//对账截止时间 + + $objPHPExcel->getActiveSheet()->getStyle('A1')->getAlignment()->setWrapText(true); + $objPHPExcel->getActiveSheet()->setCellValue('A1', "《 {$data['channel_name']} 》结算单\n（{$statement_begin_time}-{$statement_end_time}）"); + if ($data['withdraw_type'] == '2') { + $objPHPExcel->getActiveSheet()->setCellValue('D2','补点比例'); + } + $line = 3; + foreach ($data['statement_info'] as $key => $value) { + $objPHPExcel->getActiveSheet()->insertNewRowBefore($line,1); + $objPHPExcel->getActiveSheet()->removeConditionalStyles(); + $objPHPExcel->getActiveSheet()->setCellValue('A'.$line, $value['begintime'] . '-' . $value['endtime']); + $product_name = $value['game_name']; + $objPHPExcel->getActiveSheet()->setCellValue('D'.$line, $value['ratio'] . '%'); + $objPHPExcel->getActiveSheet()->setCellValue('E'.$line, $value['fax_ratio'] . '%'); + $objPHPExcel->getActiveSheet()->setCellValue('C'.$line, $value['money']); + $objPHPExcel->getActiveSheet()->setCellValue('B'.$line, $product_name); + $objPHPExcel->getActiveSheet()->setCellValue('F'.$line, $value['ratio_money']); + + $objPHPExcel->getActiveSheet()->getStyle('A'.$line)->getFont()->setBold(false); + $objPHPExcel->getActiveSheet()->getStyle('B'.$line)->getFont()->setBold(false); + $objPHPExcel->getActiveSheet()->getStyle('C'.$line)->getFont()->setBold(false); + $objPHPExcel->getActiveSheet()->getStyle('D'.$line)->getFont()->setBold(false); + $objPHPExcel->getActiveSheet()->getStyle('E'.$line)->getFont()->setBold(false); + $objPHPExcel->getActiveSheet()->getStyle('F'.$line)->getFont()->setBold(false); + $line++; + } + $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_money']);//合计-平台总额 + $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $data['ratio_money']);//合计-结算金额 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+1), $big_all_sum_money);//大写支付结算金额 + //甲方信息 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+3), $data['first_party_info']['partner']);//甲方 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+4), $data['first_party_info']['link_man']);//联系人 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+5), $data['first_party_info']['link_phone']);//联系电话 + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+6), $data['first_party_info']['address']);//邮寄地址 +// $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $data['second_party_info']['invoice_type']);//发票类型 + //乙方信息 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+3), $data['second_party_info']['partner']);//乙方 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+4), $data['second_party_info']['link_man']);//联系人 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+5), $data['second_party_info']['link_phone']);//联系电话 + $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+6), $data['second_party_info']['address']);//邮寄地址 + + //开票信息 +// $invoice_data = "发票类型：".$data['second_party_info']['invoice_type']; +// $invoice_data .= "\n发票抬头：".$data['second_party_info']['partner']; +// $invoice_data .= "\n纳税人识别号：".$data['second_party_info']['company_tax_no']; +// +// $invoice_data .= "\n开户银行：".$data['second_party_info']['opening_bank']; +// $invoice_data .= "\n开户账号：".$data['second_party_info']['payee_name']; +// $invoice_data .= "\n开票内容：".$data['second_party_info']['invoice_item']; +// $invoice_data .= "\n注册地址及电话：".$data['second_party_info']['register_address'].",".$data['second_party_info']['register_phone']; +// +// $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $invoice_data);//乙方 + + $first_data = "户名：{$data['pay_company']['payee_name']}"; + $first_data .= "\n账号：{$data['pay_company']['bank_account']}"; + $first_data .= "\n开户行：{$data['pay_company']['opening_bank']}"; + $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+7), $first_data);//户名 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+8), $data['pay_company']['payee_name']);//户名 +// $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+9), $data['pay_company']['bank_account']);//银行账号 // $objPHPExcel->getActiveSheet()->setCellValue('E'.($line+10), $data['pay_company']['opening_bank']);//开户行 if($data['withdraw_type'] == 1){ $m = date('Y.m', $data['begintime']); From c7af3bdb1d9f2640fb8c75a44a3fe2ec71f02438 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 3 Sep 2020 13:40:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A1=A5=E7=82=B9=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementController.class.php | 2 +- .../View/CompanyStatement/viewSpecialComplement.html | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 042994766..df578d116 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -1181,7 +1181,7 @@ class CompanyStatementController extends ThinkController $radioMap['_string'] = "start_time < {$end_time}"; } $map['tab_spend.pay_status'] = 1; - $map['pay_way'] = ['egt',1]; + $map['pay_way'] = ['egt',0]; $data = M("spend","tab_") ->field("pay_amount,relation_game_id,relation_game_name,payed_time") diff --git a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html index 78e728319..3b43c077d 100644 --- a/Application/Admin/View/CompanyStatement/viewSpecialComplement.html +++ b/Application/Admin/View/CompanyStatement/viewSpecialComplement.html @@ -431,14 +431,16 @@ //时间数组定义用于判断当前选择的游戏是否有结算过的区间 var begin_time = []; var end_time = []; - var get_time = $(cval).parent(); - var row =$(cval).attr('rowspan'); for (var i=0; i= get_time.find('.begin_time').text()&&data[item]['begin_time'][item_sec] <= get_time.find('.end_time').text()) + || (data[item]['end_time'][item_sec] >= get_time.find('.begin_time').text()&&data[item]['end_time'][item_sec] <= get_time.find('.end_time').text()) + ||(data[item]['begin_time'][item_sec]<=get_time.find('.begin_time').text()&&data[item]['end_time'][item_sec]>=get_time.find('.end_time').text()))) { begin_time.push(get_time.find('.begin_time').text()); end_time.push(get_time.find('.end_time').text()); @@ -448,6 +450,7 @@ get_time = get_time.next(); } + for (var time in begin_time) { if ((begin_time[time]>=time_start && begin_time[time]<=time_end) || (end_time[time]>=time_start && end_time[time]<=time_end)||(begin_time[time]<=time_start && end_time[time] >= time_end)) {