From fba89ccb4861c63cb5fe9efae12a560ac95842b8 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 4 Nov 2019 17:35:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=90=8E=E5=8F=B0->=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E7=AE=A1=E7=90=86->=E7=BB=93=E7=AE=97=E6=98=8E?=
 =?UTF-8?q?=E7=BB=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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 72160c12f..67a5c6191 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -55,7 +55,7 @@ class FinanceController extends BaseController
             $map['pay_time'] = ['between', [$begTime, $endTime + 86399]];
         }
 
-        $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,selle_ratio,convert(pay_amount*selle_ratio,decimal(10,2)) as income,pay_time,selle_status')
+        $data = $model->field('pay_order_number,game_name,user_account,promote_account,pay_amount,pay_way,if(selle_ratio >= 0,selle_ratio,0) as selle_ratio,convert(pay_amount*if(selle_ratio >= 0,selle_ratio,0),decimal(10,2)) as income,pay_time,selle_status')
             ->where($map)
             ->order('id desc')
             ->page($page, $row)