From 2892562b2c5c71d1eba7b0e3610ae159565c6374 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 23 Mar 2021 16:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=89=93=E6=AC=BE=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9Fbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompanyStatementController.class.php       |  9 ++++++---
 .../CompanyStatement/editWmCpStatement.html    | 18 +++++++++---------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php
index 2d7b1c94b..d6725759f 100644
--- a/Application/Admin/Controller/CompanyStatementController.class.php
+++ b/Application/Admin/Controller/CompanyStatementController.class.php
@@ -367,13 +367,16 @@ class CompanyStatementController extends ThinkController
 
             if(is_array($dbres['statement_info'])) {
                 foreach ($dbres['statement_info'] as $key => $value) {
+
+                    $dbres['pay_amount_other'] += $value['platform_money'];
+
                     if ($value['game_name'] == "罚款" || $value['game_name'] == "奖励") {
                         $dbres['statement_info'][$key]['pay_amount'] = "-";
                     }
 
-
                     $real_statement_amount
-                        = number_format($value['platform_money']*(1-$value['promote_ratio']/100)*($value['ratio']/100)*(1-$value["fax_ratio"]/100),2,'.','');;
+                        = number_format(($value['platform_money']+$value['aggregate_money'])*(1-$value['promote_ratio']/100)*($value['ratio']/100)*(1-$value["fax_ratio"]/100),2,'.','');
+
                     if (!$dbres['statement_info'][$key]['other_amount']) {
                         $dbres['statement_info'][$key]['other_amount'] = number_format($value["sum_money"] - $real_statement_amount,2,'.','');
                     }
@@ -673,7 +676,7 @@ class CompanyStatementController extends ThinkController
                     $statement_info[$k]['sum_amount'] = $v["platform_money"] + $v["aggregate_money"] ;
 
                     $real_statement_amount
-                        = number_format($v['platform_money']*(1-$v['promote_ratio']/100)*($v['ratio']/100)*(1-$v["fax_ratio"]/100),2,'.','');;
+                        = number_format(($v['platform_money']+$value['aggregate_money'])*(1-$v['promote_ratio']/100)*($v['ratio']/100)*(1-$v["fax_ratio"]/100),2,'.','');
                     if (!$statement_info[$k]['other_amount']) {
                         $statement_info[$k]['other_amount'] = number_format($v["sum_money"] - $real_statement_amount,2,'.','');
                     }
diff --git a/Application/Admin/View/CompanyStatement/editWmCpStatement.html b/Application/Admin/View/CompanyStatement/editWmCpStatement.html
index e292a9d01..cff930076 100644
--- a/Application/Admin/View/CompanyStatement/editWmCpStatement.html
+++ b/Application/Admin/View/CompanyStatement/editWmCpStatement.html
@@ -210,12 +210,12 @@
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">渠道费率</th>
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">税费费率</th>
                         <th rowspan="2" style="border-right: solid 1px #b6cad2;">其他</th>
-                        <th>结算金额</th>
-                    </tr>
-                    <tr>
-                        <th style="font-size: 10px;font-weight: 400;max-width: 100px;line-height: 1.2;">
-                            结算金额=平台总额*（1-渠道费）*分成比例*(1-税费费率)</th>
+                        <th rowspan="2" style="border-right: solid 1px #b6cad2;">结算金额</th>
                     </tr>
+<!--                    <tr>-->
+<!--                        <th style="font-size: 10px;font-weight: 400;max-width: 100px;line-height: 1.2;">-->
+<!--                            结算金额=平台总额*（1-渠道费）*分成比例*(1-税费费率)</th>-->
+<!--                    </tr>-->
                 </thead>
 
                 <!-- 列表 -->
@@ -373,11 +373,11 @@
             <td>${it.statement_begin_time}~${it.statement_end_time}</td>
             <td>${it.game_name}</td>
             {@if it.statement_type==1}
-                <td>-${it.pay_amount}元</td>
+                <td>-${it.platform_money}元</td>
             {@else}
-                <td>${it.pay_amount}元</td>
+                <td>${it.platform_money}元</td>
             {@/if}
-            <td>${it.aggregate_money}</td>
+            <td>${it.aggregate_money}元</td>
             
             {@if it.statement_type==0}
                 <td><input type="text" class="txt statementchange" name="ratio" data-index ="${index}" data-change="statement_info[${index}]['ratio']" value="${it.ratio}" style="width: 40px;">%</td>
@@ -404,7 +404,7 @@
     <tr>
         <td>合计</td>
         <td></td>
-        <td>${pay_amount}元</td>
+        <td>${pay_amount_other}元</td>
         <td></td>
         <td></td>
         <td></td>