From e67538fcef3b33f817ba8f5b8e8c0eb5391c7d68 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 31 Jul 2020 10:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=B1=87=E6=80=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1bug=E4=BF=AE=E6=94=B9=E6=B1=87=E6=80=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinancialSummarySetController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinancialSummarySetController.class.php b/Application/Admin/Controller/FinancialSummarySetController.class.php index 234370329..ea596ae17 100644 --- a/Application/Admin/Controller/FinancialSummarySetController.class.php +++ b/Application/Admin/Controller/FinancialSummarySetController.class.php @@ -525,7 +525,7 @@ class FinancialSummarySetController extends \Think\Controller 0 offcial_amount,0 spread_amount,0 supersign_amount,0 test_order_amount,merchant_id,name,channel,identifier,payed_time,0 game_id,main_name,merchant_way,merchant.account,tab_deposit.pay_way") ->where(['pay_status'=>1,'tab_deposit.pay_way'=>['egt',1],'merchant.status'=>1,'merchant.type'=>1]) ->where($map) - ->group("merchant_id,merchant_way") + ->group("merchant_id") ->select(false); //官网金额 $officalData = M('deposit','tab_') @@ -536,7 +536,7 @@ class FinancialSummarySetController extends \Think\Controller 0 spread_amount,0 supersign_amount,0 test_order_amount,merchant_id,name,channel,identifier,payed_time,0 as game_id,main_name,merchant_way,merchant.account,tab_deposit.pay_way") ->where(['pay_status'=>1,'tab_deposit.pay_way'=>['egt',1],'merchant.status'=>1,'merchant.type'=>1]) ->where($map) - ->group("merchant_id,merchant_way") + ->group("merchant_id") ->select(false); $map['pay_time'] = $map['payed_time']; unset($map['payed_time']);