From c59aeaa9d3bfe1017c45b5dc1c1d7c9677f45594 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 19 Feb 2020 16:00:49 +0800 Subject: [PATCH] upt --- Application/Admin/Controller/SettlementController.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/SettlementController.class.php b/Application/Admin/Controller/SettlementController.class.php index 5a80b074b..ee9bbd7ad 100644 --- a/Application/Admin/Controller/SettlementController.class.php +++ b/Application/Admin/Controller/SettlementController.class.php @@ -208,12 +208,11 @@ class SettlementController extends ThinkController g.relation_game_name, g.relation_game_id, sum(s.pay_amount) as amount from tab_spend s - inner join tab_promote p on p.chain like '/{$item['id']}/%' and s.promote_id = p.id + inner join tab_promote p on (p.chain like '/{$item['id']}/%' or p.id = {$item['id']}) and s.promote_id = p.id inner join tab_game g on s.game_id = g.id where s.pay_status = 1 and s.pay_time BETWEEN {$time_start} and {$time_end} group by g.relation_game_id "); - if ($res) { if (!isset($list[$item['p_id']])) { // 奖罚金额 @@ -281,7 +280,7 @@ class SettlementController extends ThinkController g.relation_game_name, g.relation_game_id, sum(s.pay_amount) as amount from tab_spend s - inner join tab_promote p on p.chain like '/{$item['id']}/%' and s.promote_id = p.id + inner join tab_promote p on (p.chain like '/{$item['id']}/%' or p.id = {$item['id']}) and s.promote_id = p.id inner join tab_game g on s.game_id = g.id where s.pay_status = 1 and s.pay_time BETWEEN {$time_start} and {$time_end} group by g.relation_game_id