From 8a1a15e845c9671cf68f419ac34db2afb73fad29 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 12 Feb 2020 15:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E4=B8=8B=E6=B8=B8=E7=BB=93=E7=AE=97=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/QueryController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 259fccaa8..28f1d333d 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -1582,7 +1582,7 @@ class QueryController extends ThinkController if (is_array($value['turnover_ratio'])) { foreach($value['turnover_ratio'] as $k =>$v) { - if($value['pay_amount']>$v['turnover']) { + if(($value['pay_amount']>=$v['turnover']&&$v['instanceof']==1) || $value['pay_amount']>$v['turnover']) { $data[$key]['downstream'] = $value['pay_amount'] * ($v['ratio']*0.01); } }