财务汇总统计bug修改汇总统计修改

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']);