汇总统计修改

Application/Admin/Controller/FinancialSummarySetController.class.php

@@ -516,16 +516,16 @@ class FinancialSummarySetController extends \Think\Controller
             ->select(false);
 
         //平台币充值金额计算
-        $coinData = M('pay_info','tab_')
-            ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
-            ->join("left join tab_test_white_list on tab_test_white_list.user_id=tab_pay_info.user_id")
+        $coinData = M('deposit','tab_')
+//            ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
+            ->join("left join tab_test_white_list on tab_test_white_list.user_id=tab_deposit.user_id")
             ->join("left join tab_payment_merchant merchant on merchant.id=tab_deposit.merchant_id")
-            ->field("0 cash_amount,SUM(CASE WHEN merchant.id is not null and tab_test_white_list.user_id is not null THEN pay_amount ELSE 0 END) as test_amount,
-            SUM(CASE WHEN merchant.id is not null and tab_test_white_list.user_id is null and pay_source=0 THEN pay_amount ELSE 0 END) as coin_amount,
-            0 offcial_amount,0 spread_amount,0 supersign_amount,0 test_order_amount,merchant_id,name,channel,identifier,payed_time,game_id,main_name,merchant_way,merchant.account")
+            ->field("0 cash_amount,SUM(CASE WHEN merchant.id is not null and pay_source=2 and tab_test_white_list.user_id is not null THEN pay_amount ELSE 0 END) as test_amount,
+            SUM(CASE WHEN merchant.id is not null and tab_test_white_list.user_id is null and pay_source=2 THEN pay_amount ELSE 0 END) as coin_amount,
+            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")
+            ->group("merchant_id,merchant_way")
             ->select(false);
         //官网金额
         $officalData = M('deposit','tab_')