From 180e21be862207f2ad7fe7449ab301eea57cf6a0 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 12 Aug 2020 18:07:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=93=E7=AE=97=E4=B8=8A?= =?UTF-8?q?=E6=B8=B8=E7=BB=93=E7=AE=97=E4=B8=BA=E4=B8=80=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 15 ++++ .../CompanyStatementPoolController.class.php | 25 +++++-- .../View/CompanyStatementPool/viewCpPool.html | 73 +++++++++++++++---- 3 files changed, 91 insertions(+), 22 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 4b4af6a5b..e50a1665e 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -1042,3 +1042,18 @@ function showPercent($num) } +function showNumPercent($num) +{ + $num -= 0; + if($num >= 0){ + if(strpos($num,"%")){ + return $num; + }else{ + return $num."%"; + } + + }else{ + return $num ?? "--"; + } +} + diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 2cf7746a9..938b4e14a 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -208,10 +208,15 @@ class CompanyStatementPoolController extends ThinkController $infolist = M("company_statement_info","tab_")->field("*,'1' as st")->where("pool_id = '{$id}'")->select(); //获取母单 $pool_info = M("company_statement_pool","tab_")->field('statement_num,create_lack_ids,verify_status,is_payment')->where("id={$id}")->find(); + if(!empty($pool_info['create_lack_ids'])){ + $l_ids = $pool_info['create_lack_ids']; + $lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select(); + $infolist =array_merge($infolist,$lack_info); + } + $statement_num = $pool_info['statement_num']; $this->assign("title",$statement_num); $this->assign("pool_status",$pool_info['verify_status']); - $this->assign("pool_status",$pool_info['verify_status']); $this->assign("is_payment",$pool_info['is_payment']); if($infolist[0]['company_type'] == 3){ //上游 @@ -220,13 +225,6 @@ class CompanyStatementPoolController extends ThinkController //下游公司 $this->viewPcPool($infolist,$is_export); }else{ - //获取母单 - if(!empty($pool_info['create_lack_ids'])){ - $l_ids = $pool_info['create_lack_ids']; - $lack_info = M("company_lack_statement_info","tab_")->field("*,'0' as st")->where("id in ({$l_ids})")->select(); - - $infolist =array_merge($infolist,$lack_info); - } $this->viewPuPool($infolist,$is_export); } @@ -378,8 +376,18 @@ class CompanyStatementPoolController extends ThinkController // foreach($infolist as $k=>&$v){ $v['statement_info'] = json_decode($v['statement_info'],true); + $v['company_info'] = json_decode($v['company_info'],true); $v['statement_begin_time'] = date('Y.m.d',$v['statement_begin_time']); $v['statement_end_time'] = date('Y.m.d',$v['statement_end_time']); + + if( isset($v['verify_status'])){ + if( $v['verify_status'] ==2 ){ + $v['is_payment'] = 2; //不打款 + }else{ + $v['is_payment'] = 1; + } + } + $cline = $line+1; if($is_export){ $v['statement_money_exp'] = "="; @@ -423,6 +431,7 @@ class CompanyStatementPoolController extends ThinkController $count["reward"] = "=".trim($count["reward_exp"],"+"); $count["statement_money"] = "=".trim($count["statement_money_exp"],"+"); } + // dd($infolist); $this->assign("data",$infolist); $this->assign("count",$count); $this->assign("is_export",$is_export); diff --git a/Application/Admin/View/CompanyStatementPool/viewCpPool.html b/Application/Admin/View/CompanyStatementPool/viewCpPool.html index 2fe543ae5..d90bf89bf 100644 --- a/Application/Admin/View/CompanyStatementPool/viewCpPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewCpPool.html @@ -112,12 +112,23 @@ 违规罚款 奖励 合作待结算金额 + + 是否结算 + 是否支付宝打款 + + 账户信息 + 备注 + 操作 合作方 我方 + + 户名 + 账号 + 开户行 @@ -126,33 +137,59 @@ {$com.company_name} {$com.matche_platform} - {$com['statement_info'][0]['statement_begin_time']} - {$com['statement_info'][0]['statement_end_time']} + {$com['statement_info'][0]['statement_begin_time']}-{$com['statement_info'][0]['statement_end_time']} {$com['statement_info'][0]['game_name']} {$com['statement_info'][0]['pay_amount']} {$com['statement_info'][0]['pay_amount']} - {$com['statement_info'][0]['ratio']}% - {$com['statement_info'][0]['company_ratio']}% - {$com['statement_info'][0]['promote_ratio']}% - {$com['statement_info'][0]['fax_ratio']}% + {$com['statement_info'][0]['ratio']|showNumPercent} + {$com['statement_info'][0]['company_ratio']|showNumPercent} + {$com['statement_info'][0]['promote_ratio']|showNumPercent} + {$com['statement_info'][0]['fax_ratio']|showNumPercent} {$com['statement_info'][0]['d_statement_money']} - {$com.fine} - {$com.reward} - {$com.statement_money} - {$com.renark} + {$com['fine']-0} + {$com['reward']-0} + {$com['statement_money']-0} + + 否 是 + 是 否 + + + {$com.company_info.payee_name} +  {$com.company_info.bank_account} + {$com.company_info.opening_bank} + + + + {$com.company_info.ali_user} + {$com.company_info.ali_account} + + + + + {$com.remark} + + + + + 不结算 + + + + - {$it['statement_begin_time']} - {$it['statement_end_time']} + {$it['statement_begin_time']}-{$it['statement_end_time']} {$it['game_name']} {$it['pay_amount']} {$it['pay_amount']} - {$it['ratio']}% - {$it['company_ratio']}% - {$it['promote_ratio']}% - {$it['fax_ratio']}% + {$it['ratio']|showNumPercent} + {$it['company_ratio']|showNumPercent} + {$it['promote_ratio']|showNumPercent} + {$it['fax_ratio']|showNumPercent} {$it['d_statement_money']} @@ -172,6 +209,14 @@ {$count.reward} {$count.statement_money} + + + + + + + +