From 21ee77609cb5b4c0bd58c3bfae45872bffe3543a Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Fri, 10 Jan 2020 09:33:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?cp/=E5=B7=A5=E4=BC=9A=E5=AF=B9=E8=B4=A6?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 8 ++++---- .../Admin/Controller/PublicController.class.php | 2 +- .../Admin/Controller/VerifyBillController.class.php | 5 ++--- Application/Admin/View/VerifyBill/company_show.html | 6 +++--- Application/Admin/View/VerifyBill/partner_show.html | 13 +++++++------ 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 2bbf3f672..e17931980 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -1886,8 +1886,8 @@ function excelUpStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_ } //合计 - $objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $all_sum_money); - $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $all_pay_amount); + $objPHPExcel->getActiveSheet()->setCellValue("E" . ($line), $data['pay_amount']); + $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line), $data['statement_money']); $objPHPExcel->getActiveSheet()->setCellValue("J" . ($line+1), $big_all_sum_money); //本月分成总金额(人民币大写) @@ -1960,8 +1960,8 @@ function excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_al $line++; } - $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $all_sum_money);//合计-平台总额 - $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $all_pay_amount);//合计-结算金额 + $objPHPExcel->getActiveSheet()->setCellValue('C'.($line), $data['pay_amount']);//合计-平台总额 + $objPHPExcel->getActiveSheet()->setCellValue('F'.($line), $data['statement_money']);//合计-结算金额 $objPHPExcel->getActiveSheet()->setCellValue('B'.($line+1), $big_all_sum_money);//大写支付结算金额 diff --git a/Application/Admin/Controller/PublicController.class.php b/Application/Admin/Controller/PublicController.class.php index 86bda178f..2afd43a19 100644 --- a/Application/Admin/Controller/PublicController.class.php +++ b/Application/Admin/Controller/PublicController.class.php @@ -78,7 +78,7 @@ class PublicController extends \Think\Controller if (IS_POST) { /* 检测验证码 TODO: */ -// $this->checksafecode($mobile, $verify, false); + $this->checksafecode($mobile, $verify, false); $promote = M('promote', 'tab_')->where([ 'mobile_phone' => $mobile, 'level' => 1, diff --git a/Application/Admin/Controller/VerifyBillController.class.php b/Application/Admin/Controller/VerifyBillController.class.php index d951bedf3..9408dc618 100644 --- a/Application/Admin/Controller/VerifyBillController.class.php +++ b/Application/Admin/Controller/VerifyBillController.class.php @@ -53,7 +53,7 @@ class VerifyBillController extends Controller { // dd($data); $all_sum_money = array_sum(array_column($data['statement_info'], 'sum_money'));//合计平台总额 $all_pay_amount = array_sum(array_column($data['statement_info'], 'pay_amount'));//合计结算金额 - $big_all_sum_money = convertAmountToCn($all_sum_money);//大写 + $big_all_sum_money = convertAmountToCn($data['statement_money']);//大写 $this->assign('big_all_sum_money', $big_all_sum_money); $this->assign('all_sum_money', $all_sum_money); $this->assign('all_pay_amount', $all_pay_amount); @@ -94,10 +94,9 @@ class VerifyBillController extends Controller { $all_sum_money = array_sum(array_column($data['statement_info'], 'sum_money'));//合计平台总额 $all_pay_amount = array_sum(array_column($data['statement_info'], 'pay_amount'));//合计结算金额 - $big_all_sum_money = convertAmountToCn($all_sum_money);//大写 + $big_all_sum_money = convertAmountToCn($data['statement_money']);//大写 $data['receive_company'] = $data['pay_type'] ? $data['first_party_info'] : $data['second_party_info']; $data['pay_company'] = $data['pay_type'] ? $data['second_party_info'] : $data['first_party_info']; - dd($data['statement_info']); if ($data['statement_type'] == 1) {//下游 excelDownStreamTemplate($data, $all_sum_money, $all_pay_amount, $big_all_sum_money); } else {//上游 diff --git a/Application/Admin/View/VerifyBill/company_show.html b/Application/Admin/View/VerifyBill/company_show.html index ad04083e1..995ba6c54 100644 --- a/Application/Admin/View/VerifyBill/company_show.html +++ b/Application/Admin/View/VerifyBill/company_show.html @@ -109,7 +109,7 @@ - {$item.type_name} - - + {$item.sum_money} - - {$item.sum_money} @@ -132,10 +132,10 @@ 总计 - - {$all_pay_amount}0 + {$data.pay_amount}0 - - - {$all_sum_money}0 + {$data.statement_money}0 本月分成总金额(人民币大写)： diff --git a/Application/Admin/View/VerifyBill/partner_show.html b/Application/Admin/View/VerifyBill/partner_show.html index 8cde640f0..688ac0c83 100644 --- a/Application/Admin/View/VerifyBill/partner_show.html +++ b/Application/Admin/View/VerifyBill/partner_show.html @@ -106,12 +106,12 @@ - {$item.type_name} - {$item.pay_amount} + {$item.sum_money}元 - - - - - {$item.sum_money} + {$item.sum_money}元 @@ -119,12 +119,12 @@ {$item.statement_begin_time}-{$item.statement_end_time} {$item.game_name} - {$item.pay_amount} + {$item.pay_amount}元 {$item.first_ratio}% {$item.second_ratio}% {$item.promote_ratio}% {$item.fax_ratio}% - {$item.sum_money} + {$item.sum_money}元 @@ -133,12 +133,13 @@ 总计 - - {$all_pay_amount}- + {$data.pay_amount}元0 + - - - - - {$all_sum_money}0 + {$data.statement_money}元0 本月分成总金额(人民币大写)： From ac0405329f5d3e9de4d62ed9ca1916115225e236 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 10 Jan 2020 09:33:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/StatementController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/StatementController.class.php b/Application/Admin/Controller/StatementController.class.php index 4c823e9c8..6a6b28989 100644 --- a/Application/Admin/Controller/StatementController.class.php +++ b/Application/Admin/Controller/StatementController.class.php @@ -64,8 +64,9 @@ class StatementController extends ThinkController $mycompany = M("tool","tab_")->field("config")->where("name='company_info'")->find(); $info = json_decode($mycompany['config'],true); $info['id'] = 0; + unset($info['status']); }else{ - $info = M("partner","tab_")->where("id = '{$CompanyId}'")->find(); + $info = M("partner","tab_")->field("id,partner,link_man,link_phone,address,company_tax_no,payee_name,bank_account,opening_bank")->where("id = '{$CompanyId}'")->find(); } if(empty($info)){ $this->ajaxReturn(array("error"=>"no find","code"=>2000)); From ef53562d0625a9cc239921631e293d424d14636b Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 10 Jan 2020 09:37:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=BE=91=E6=B7=BB=E5=8A=A0=E6=88=B7?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Query/marketList.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/View/Query/marketList.html b/Application/Admin/View/Query/marketList.html index d8890f4c4..d4ea3fa5d 100644 --- a/Application/Admin/View/Query/marketList.html +++ b/Application/Admin/View/Query/marketList.html @@ -214,6 +214,7 @@ Think.setValue('{$key}',"{$vo}"); + highlight_subnav('{:U('StatementMangement/lists')}'); $(".select_gallery").select2();