diff --git a/Application/Admin/Controller/CompanyStatementPoolController.class.php b/Application/Admin/Controller/CompanyStatementPoolController.class.php index 481b9b0c9..d8696f484 100644 --- a/Application/Admin/Controller/CompanyStatementPoolController.class.php +++ b/Application/Admin/Controller/CompanyStatementPoolController.class.php @@ -615,10 +615,15 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ +// if($v['withdraw_type'] != 3) { +// $va['d_statement_money'] = "=ROUND(E{$line}*(1-H{$line})*(F{$line}+G{$line}),2)"; +// } else { +// $va['d_statement_money'] = "=ROUND(E{$line}*(G{$line}),2)"; +// } if($v['withdraw_type'] != 3) { - $va['d_statement_money'] = "=ROUND(E{$line}*(1-H{$line})*(F{$line}+G{$line}),2)"; + $va['d_statement_money'] = "=ROUND(D{$line}*(1-G{$line})*(E{$line}+F{$line}),2)"; } else { - $va['d_statement_money'] = "=ROUND(E{$line}*(G{$line}),2)"; + $va['d_statement_money'] = "=ROUND(D{$line}*(F{$line}),2)"; } }else{ if ($v['withdraw_type'] != 3) { @@ -694,7 +699,8 @@ class CompanyStatementPoolController extends ThinkController if($is_export){ if ($v['withdraw_type'] != 3) { - $v['statement_money'] = "=ROUND(SUM(I{$cline}:I{$line})+K{$cline}-J{$cline},2)"; +// $v['statement_money'] = "=ROUND(SUM(I{$cline}:I{$line})+K{$cline}-J{$cline},2)"; + $v['statement_money'] = "=ROUND(SUM(H{$cline}:H{$line})+J{$cline}-I{$cline},2)"; } }else{ @@ -709,11 +715,11 @@ class CompanyStatementPoolController extends ThinkController } if($is_export){ - $count["platform_amount"] = "=ROUND(SUM(E2:E".$line."),2)"; - $count["d_statement_money"] = "=ROUND(SUM(I2:I".$line."),2)"; - $count["fine"] = "=ROUND(SUM(J2:J".$line."),2)"; - $count["reward"] = "=ROUND(SUM(K2:K".$line."),2)"; - $count["statement_money"] = "=ROUND(SUM(M2:M".$line."),2)"; + $count["platform_amount"] = "=ROUND(SUM(D2:D".$line."),2)"; + $count["d_statement_money"] = "=ROUND(SUM(H2:H".$line."),2)"; + $count["fine"] = "=ROUND(SUM(I2:I".$line."),2)"; + $count["reward"] = "=ROUND(SUM(J2:J".$line."),2)"; + $count["statement_money"] = "=ROUND(SUM(K2:K".$line."),2)"; } // dd($infolist); $this->assign("data",$infolist); diff --git a/Application/Admin/View/CompanyStatementPool/viewPcPool.html b/Application/Admin/View/CompanyStatementPool/viewPcPool.html index e86f97538..41dd1e73f 100644 --- a/Application/Admin/View/CompanyStatementPool/viewPcPool.html +++ b/Application/Admin/View/CompanyStatementPool/viewPcPool.html @@ -190,10 +190,11 @@ - 合计: + 合计: {$count.platform_amount} + {$count.d_statement_money} {$count.fine} {$count.reward}