From 223c69797c0036e58df5080684178518a6acafad Mon Sep 17 00:00:00 2001 From: zyx Date: Thu, 6 Aug 2020 22:22:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81=E5=AF=BC=E5=87=BAbu?= =?UTF-8?q?g=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/TimingController.class.php | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 7debc9146..d86a58756 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -785,11 +785,26 @@ class TimingController extends AdminController { CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE promote_id END promote_id,pay_way,market_admin_id") ->join("left join tab_promote on tab_spend.promote_id = tab_promote.id") ->join("left join tab_game game on game.id=tab_spend.game_id") - ->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',0]]) + ->where(['tab_spend.pay_status'=>1,'pay_way'=>['egt',1]]) ->where($spend_map) ->group("tab_spend.id") ->select(false); -// var_dump($spend);die(); + + $desposit = M("deposit","tab_") + ->field("sum(pay_amount) as pay_amount,FROM_UNIXTIME(payed_time,'%Y-%m') pay_time, + substring_index(substring_index(tab_pay_info.game_name,'(',1),'(',-1) game_name,game_id,relation_game_id,tab_deposit.sdk_version, + CASE WHEN substring_index(substring_index(`chain`,'/',2),'/',-1) !='' THEN substring_index(substring_index(`chain`,'/',2),'/',-1) ELSE tab_pay_info.promote_id END promote_id,tab_deposit.pay_way,market_admin_id") + ->join("inner join tab_pay_info on tab_pay_info.order_id=tab_deposit.pay_order_number") + ->join("left join tab_promote on tab_deposit.promote_id = tab_promote.id") + ->join("left join tab_game game on game.id=tab_pay_info.game_id") + ->where(['tab_deposit.pay_status'=>1,'tab_deposit.pay_way'=>['egt',1],'pay_source'=>2]) + ->where($spend_map) + ->group("tab_deposit.id") + ->select(false); + + $spend = "{$spend} UNION ALL {$desposit}"; + +// var_dump($desposit);die(); $payway_spend = M()->table("({$spend}) spend") ->field("sum(pay_amount) as pay_amount,pay_time,promote_id,game_name,game_id,relation_game_id,pay_way,sdk_version") ->where($map)