From f1fda49e9e4b278838975f1c05ccd4c182f72509 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 5 Feb 2020 17:50:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/FinanceController.class.php | 3 ++-
 Application/Home/View/default/GameDivide/index.html     | 2 --
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 8ecbce4d2..2c8c9d2f5 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -130,7 +130,7 @@ class FinanceController extends BaseController
             $map['pay_time'] = ['between', [$begTime, $endTime]];
             $dayList = $this->getDayList($begTime, $endTime);
             $data = $model->field('FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,
-        sum(if(selle_ratio > 0, pay_amount * selle_ratio, 0)) as income')
+        sum(if(selle_ratio > 0, pay_amount * selle_ratio, 0)) as income, selle_status')
                 ->where($map)
                 ->group('day')
                 ->select();
@@ -140,6 +140,7 @@ class FinanceController extends BaseController
                 $records[] = [
                     'day' => $date,
                     'income' => bcdiv($data[$day], 100, 2),
+//                    'selle_status_text' => empty($data[$day]),
                     'url' => U('settlementDtl', array('begtime' => $day, 'endtime' => $day))
                 ];
             }
diff --git a/Application/Home/View/default/GameDivide/index.html b/Application/Home/View/default/GameDivide/index.html
index 3542f4717..8a45d0f72 100644
--- a/Application/Home/View/default/GameDivide/index.html
+++ b/Application/Home/View/default/GameDivide/index.html
@@ -192,7 +192,6 @@
               <th>游戏类型</th>
               <th>平台</th>
               <th>混服情况</th>
-              <th>玩家折扣</th>
               <th>分成比例</th>
             </tr>
             <empty name="dataList">
@@ -210,7 +209,6 @@
                   <td>{$vo.game_type_name}</td>
                   <td>{:getSDKTypeName($vo['sdk_version'])}</td>
                   <td><?=($vo['server_type']==1)?'专服':'混服'?></td>
-                  <td><?=($vo['discount']==10)?'----':($vo['discount'].'折')?></td>
                   <td>{$vo.ratio}%</td>
                 </tr>
               </volist>