From 45cea9fa42dc6e6dba1e213d171907aeda9f5d74 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 20 May 2021 14:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=AE=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 2 +-
 Application/Home/Controller/QueryController.class.php    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 51adae6ff..046040c6b 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -4436,7 +4436,7 @@ public function iosDetailExcelInfo($id,$map) {
          $now = date('Y-m-d');
          $now = strtotime($now);
          $nowTimeEnd = $now + 3600 * 24 - 1;
-         $spendMap['_string'] = 'today.user_id = uc.user_id and today.game_id = uc.game_id and today.server_id = uc.server_id and today.game_player_id = uc.game_player_id and today.promote_id = uc.promote_id';
+         $spendMap['_string'] = 'today.user_id = uc.user_id and today.game_id = uc.game_id and today.server_id = uc.server_id and today.game_player_id = uc.game_player_id'; // and today.promote_id = uc.promote_id';
          $spendMap['today.pay_status'] = 1;
          $spendMap['today.pay_time'] = ['between', [$now, $nowTimeEnd]];
 
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index d6829874e..43bac5a69 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1993,8 +1993,8 @@ class QueryController extends BaseController
             $map['s.pay_time'] = ['between', [$begTime, $endTime - 1]];
             $fieldS = "sum(s.pay_amount) recharge_cost, count(*) recharge_count, s.user_id, s.user_account, s.promote_id, s.promote_account, s.game_name, s.sdk_version, s.server_name, SUBSTRING_INDEX(GROUP_CONCAT(s.game_player_name order by s.id desc), ',', 1) as game_player_name";
             $fieldUser = 'u.register_time, u.login_time';
-
-            $spendMap['_string'] = 'today.user_id = s.user_id and today.game_id = s.game_id and today.server_id = s.server_id and today.game_player_id = s.game_player_id and today.promote_id = s.promote_id';
+            
+            $spendMap['_string'] = 'today.user_id = s.user_id and today.game_id = s.game_id and today.server_id = s.server_id and today.game_player_id = s.game_player_id'; //  and today.promote_id = s.promote_id';
             $spendMap['today.pay_status'] = 1;
             $spendMap['today.pay_time'] = ['between', [$nowTime, $nowTimeEnd]];