From 174f90bff427bf6c9d92404288ceca9828b6e8af Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 14:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=90=88=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/FinanceController.class.php  | 5 ++++-
 Application/Home/View/default/Finance/settlementDtl.html | 9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index b9d6d174f..c0c245b2e 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -223,9 +223,12 @@ class FinanceController extends BaseController
                 ->page($page, $row)
                 ->select();
             $count = $model->where($map)->count();
-            $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income')
+            $total = $model->field('sum(pay_amount) as pay_amount,sum(if(pay_way > -1,pay_amount,0)) as direct_pay_amount,sum(if(pay_way = -1,pay_amount,0)) as inner_pay_amount,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income')
                 ->where($map)
                 ->find();
+            $total['direct_pay_amount'] = empty($total['direct_pay_amount']) ? '0.00' : $total['direct_pay_amount'];
+            $total['inner_pay_amount'] = empty($total['inner_pay_amount']) ? '0.00' : $total['inner_pay_amount'];
+            $total['income'] = empty($total['income']) ? 0 : $total['income'];
             $total['income'] = bcdiv($total['income'], 100, 2);
 
             //提现状态
diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html
index a62bdff29..bb44b46ef 100644
--- a/Application/Home/View/default/Finance/settlementDtl.html
+++ b/Application/Home/View/default/Finance/settlementDtl.html
@@ -182,13 +182,8 @@
                   <td>--</td>
                   <td>--</td>
                   <td>{$total.pay_amount}</td>
-                  <if condition="$total.pay_way eq -1">
-                    <td>0.00</td>
-                    <td>{$total.pay_amount}</td>
-                    <else/>
-                    <td>{$total.pay_amount}</td>
-                    <td>0.00</td>
-                  </if>
+                  <td>{$total.direct_pay_amount}</td>
+                  <td>{$total.inner_pay_amount}</td>
                   <td>--</td>
                   <td>{$total.income}</td>
                   <td>--</td>