From 781d6d408a7f29c4afeb9b6e14532f0d3ab42939 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 2 Dec 2019 22:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86->=E5=85=85=E5=80=BC=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php
index 5193fce76..c704aec94 100644
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@@ -926,7 +926,6 @@ public function  auto_rrdae(){
     {
         if (isset($map['pay_time'])) {
             $map['pay_status'] = 1;
-            $map['pay_game_status'] = 1;
             $map['game_player_id'] = ['gt', 0];
             $map['server_id'] = ['gt', 0];
             $field = 'FROM_UNIXTIME(pay_time, "%Y-%m-%d") as day,promote_id,user_id,game_id,server_id,game_player_id,sum(pay_amount) as recharge_cost,count(id) as recharge_count';
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index dabfd8ac5..45cb5274c 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1828,7 +1828,7 @@ class QueryController extends BaseController
             $field = $fieldUC . ',' . $fieldUI;
             $subQuery = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($field)
-                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
                 ->group('uc.role_id,uc.server_id,uc.game_id')
                 ->buildSql();
@@ -1837,7 +1837,7 @@ class QueryController extends BaseController
                 ->order($orderBy);
             $total = M('user_play_data_count', 'tab_')->alias('uc')
                 ->field($fieldUC)
-                ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
+                ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id')
                 ->where($map)
                 ->find();