Merge pull request '有害' (#336) from hotfix/user_recharges_bug into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/336

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

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