优化计算及导出

Application/Admin/Controller/GameMarginController.class.php

@@ -427,7 +427,7 @@ class GameMarginController extends AdminController
                 $v["jh_margin_ratio"] = "=ROUND(Y{$line}/V{$line},3)";
             }
 
-            $v['margin_amount'] = "=ROUND((D{$line}-G{$line}-I{$line}-J{$line}-M{$line}-R{$line}+X{$line}),2)";
+            $v['margin_amount'] = "=ROUND((D{$line}-G{$line}-I{$line}-J{$line}-M{$line}-R{$line}-(V{$line}-X{$line})),2)";
             $v['margin_ratio'] = "=ROUND(AB{$line}/D{$line},3)";
 
 
@@ -565,7 +565,7 @@ class GameMarginController extends AdminController
             $item["jh_margin_amount"] = round( $item["jh_statement_amount"]-$item["jh_pay_amount"]*(1-$item['cp_promote_ratio']/100)*($item["cp_ratio"]+$item['cp_rebate_ratio'])/100 ,2);
             $item["jh_margin_ratio"] = round($item["jh_margin_amount"]/$item['jh_pay_amount'],4)*100;
         }
-        $item['margin_amount'] = round( ($item['pay_amount']-$item['cp_statement_amount']-$item['cp_rebate_amount']-$item['cp_other_amount']-$item['pc_statement_amount']-$item['pu_statement_amount']+$item['jh_statement_amount']),2);
+        $item['margin_amount'] = round( ($item['pay_amount']-$item['cp_statement_amount']-$item['cp_rebate_amount']-$item['cp_other_amount']-$item['pc_statement_amount']-$item['pu_statement_amount']-($item['jh_pay_amount'] - $item['jh_statement_amount'])),2);
         $item['margin_ratio'] = round($item['margin_amount']/$item['pay_amount'],4)*100;
 
         $margin_amount = 0;