Merge branch 'feature/add_item_other' of wmtx/platform into master

优化导出cp

Application/Admin/Controller/CompanyStatementPoolController.class.php

@@ -822,12 +822,15 @@ class CompanyStatementPoolController extends ThinkController
 
             $cline = $line+1;
             foreach($v['statement_info'] as $ke=>&$va){
+                // dd($va);
                 $line ++;
                 $va['company_ratio'] = 100-$va['ratio'];
                 if($is_export){
-                    $va['d_statement_money'] =  "=ROUND(F{$line}*G{$line},2)";
+                    $va['d_statement_money'] =  "=ROUND(F{$line}*(1-I{$line})*G{$line}*(1-J{$line}),2)";//=ROUND(F3*(1-I3)*G3*(1-J3),2)
                 }else{
-                    $va['d_statement_money'] =  round($va['pay_amount']*$va['ratio']/100,2);
+
+                    $va['d_statement_money'] =  round($va['pay_amount']*(100-$va['promote_ratio'])*$va['ratio']*(100-$va['fax_ratio'])/1000000,2);
+
                     $count['platform_amount'] += $va['pay_amount'];
                     $count['platform_amount2'] += $va['pay_amount'];
                     $count['d_statement_money'] +=  $va['d_statement_money'];