From 6557938e535d9307cfa87ac4af3222ae9a3c33a1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Sat, 9 May 2020 15:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=9A=E5=90=88=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93=E8=B4=A2=E5=8A=A1=E7=BB=93=E7=AE=97=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AggregateFinanceStatementController.class.php    |  5 +++--
 .../AggregateFinanceStatement/createStatement.html   | 12 ++++++------
 .../AggregateFinanceStatement/editStatement.html     | 12 ++++++------
 .../Admin/View/AggregateFinanceStatement/lists.html  |  4 +++-
 .../AggregateFinanceStatement/viewStatement.html     | 12 ++++++------
 5 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Application/Admin/Controller/AggregateFinanceStatementController.class.php b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
index e1a3a7bcf..deab109d2 100644
--- a/Application/Admin/Controller/AggregateFinanceStatementController.class.php
+++ b/Application/Admin/Controller/AggregateFinanceStatementController.class.php
@@ -110,7 +110,8 @@ class AggregateFinanceStatementController extends ThinkController
 
             $data[$key]['oplist'] = $this->OpAuth($value);
         }
-        $count =  M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money,SUM(pay_money) pay_money")->where($map)->find();
+        $count =  M("aggregate_statement","tab_")->field("count(id) count,SUM(ratio_money) ratio_money")->where($map)->find();
+        $pay_money_count = M("aggregate_statement","tab_")->field("SUM(pay_money) pay_money")->where($map)->where("withdraw_type <> 2")->find()['pay_money'];
 
         //分页
         $parameter['p'] = $page;
@@ -123,7 +124,7 @@ class AggregateFinanceStatementController extends ThinkController
         $this->assign('menubtn',$this->menuAuth());
         $this->assign('data',$data);
         $this->assign('total',$count['ratio_money']);
-        $this->assign('pay_money',$count['pay_money']);
+        $this->assign('pay_money',$pay_money_count);
         $this->assign('channel',$this->getAggChannel());
         $this->assign('verify_status',$this->verify_status);
         $this->display();
diff --git a/Application/Admin/View/AggregateFinanceStatement/createStatement.html b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
index 15b16ea59..c2786ac5e 100644
--- a/Application/Admin/View/AggregateFinanceStatement/createStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/createStatement.html
@@ -224,10 +224,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
 
@@ -408,20 +408,20 @@
         <tr>
             <td>${it.begintime}~${it.endtime}</td>
             <td>${it.game_name}</td>
-            <td>${it.money}元</td>
+            <td>${it.money}</td>
             <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>
             <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
-            <td>${it.ratio_money}元</td>
+            <td>${it.ratio_money}</td>
         </tr>
     {@/each}
 
     <tr>
         <td>合计</td>
         <td></td>
-        <td>${count.pay_money}元</td>
+        <td>${count.pay_money}</td>
         <td></td>
         <td></td>
-        <td>${count.ratio_money}元</td>
+        <td>${count.ratio_money}</td>
     </tr>
     <tr>
         <td colspan=5>本月分成总金额(人民币大写):</td>
diff --git a/Application/Admin/View/AggregateFinanceStatement/editStatement.html b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
index 319ccda07..0a4759a80 100644
--- a/Application/Admin/View/AggregateFinanceStatement/editStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/editStatement.html
@@ -210,10 +210,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
 
@@ -394,20 +394,20 @@
         <tr>
             <td>${it.begintime}~${it.endtime}</td>
             <td>${it.game_name}</td>
-            <td>${it.money}元</td>
+            <td>${it.money}</td>
             <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>
             <td><input type="text" class="txt statementchange" name="fax_ratio" data-index ="${index}" data-change="statement_info[${index}]['fax_ratio']" value="${it.fax_ratio}" style="width: 40px;">%</td>
-            <td>${it.ratio_money}元</td>
+            <td>${it.ratio_money}</td>
         </tr>
     {@/each}
 
     <tr>
         <td>合计</td>
         <td></td>
-        <td>${count.pay_money}元</td>
+        <td>${count.pay_money}</td>
         <td></td>
         <td></td>
-        <td>${count.ratio_money}元</td>
+        <td>${count.ratio_money}</td>
     </tr>
     <tr>
         <td colspan=5>本月分成总金额(人民币大写):</td>
diff --git a/Application/Admin/View/AggregateFinanceStatement/lists.html b/Application/Admin/View/AggregateFinanceStatement/lists.html
index f37b6fd03..9a828bb2a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/lists.html
+++ b/Application/Admin/View/AggregateFinanceStatement/lists.html
@@ -132,6 +132,7 @@
                         <th>结算日期</th>
                         <th>结算周期</th>
                         <th>结算类型</th>
+                        <th>结算流水</th>
                         <th>结算金额</th>
                         <th>审批状态</th>
                         <th>操作人</th>
@@ -156,6 +157,7 @@
                                 <td>{$data.begintime}-{$data.endtime}</td>
                                 <td>{$data.withdraw_type_1}</td>
                                 <td>{$data.withdraw_type_2}</td>
+                                <td>{$data.pay_money}</td>
                                 <td>{$data.ratio_money}</td>
                                 <td>{$data.verify_status_str}</td>
                                 <td>{$data.admin_name}</td>
@@ -168,7 +170,7 @@
                                 
                             </tr>
                         </volist>
-                        <tr><td>合计</td><td colspan="10">结算总流水：{$pay_money}元&#12288;&#12288;&#12288;&#12288;结算金额：{$total}元 </td></tr>
+                        <tr><td>合计</td><td colspan="10">结算总流水：{$pay_money}元(补点单据不重复计算在内)&#12288;&#12288;&#12288;&#12288;结算总金额：{$total}元 </td></tr>
                     </notemtpy>
                     </tbody>
                 </table>
diff --git a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
index 9d7bf0bb3..037f7d39a 100644
--- a/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
+++ b/Application/Admin/View/AggregateFinanceStatement/viewStatement.html
@@ -192,10 +192,10 @@
                 <tr>
                     <th style="border-right: solid 1px #b6cad2;">结算时间</th>
                     <th style="border-right: solid 1px #b6cad2;">产品</th>
-                    <th style="border-right: solid 1px #b6cad2;">平台总额</th>
+                    <th style="border-right: solid 1px #b6cad2;">平台总额(元)</th>
                     <th style="border-right: solid 1px #b6cad2;">分成比例</th>
                     <th style="border-right: solid 1px #b6cad2;">税费费率</th>
-                    <th >结算金额</th>
+                    <th >结算金额(元)</th>
                 </tr>
                 </thead>
                 <tbody id="statementShow">
@@ -203,10 +203,10 @@
                         <tr>
                             <td>{$it.begintime}~{$it.endtime}</td>
                             <td>{$it.game_name}</td>
-                            <td>{$it.money}元</td>
+                            <td>{$it.money}</td>
                             <td><input type="text" class="txt statementchange" name="ratio" disabled="disabled" value="{$it.ratio}" style="width: 40px;">%</td>
                             <td><input type="text" class="txt statementchange" name="fax_ratio" disabled="disabled" value="{$it.fax_ratio}" style="width: 40px;">%</td>
-                            <td>{$it.ratio_money}元</td>
+                            <td>{$it.ratio_money}</td>
                         </tr>
                         <!-- {$key}|{$vo} -->
                     </foreach>
@@ -214,10 +214,10 @@
                     <tr>
                         <td>合计</td>
                         <td></td>
-                        <td>{$data.statement_count.pay_money}元</td>
+                        <td>{$data.statement_count.pay_money}</td>
                         <td></td>
                         <td></td>
-                        <td>{$data.statement_count.ratio_money}元</td>
+                        <td>{$data.statement_count.ratio_money}</td>
                     </tr>
                     <tr>
                         <td colspan=5>本月分成总金额(人民币大写):</td>