From 31e045bdba67de0913dce80f8b843a03e0fbc810 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 26 Dec 2019 17:30:14 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/QueryController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 2898fb1b7..73395f72c 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -1863,7 +1863,7 @@ class QueryController extends BaseController
                 ->field($field)
                 ->join('join tab_user as u on u.id = s.user_id')
                 ->where($map)
-                ->group('s.game_player_id, s.server_id, s.game_id')
+                ->group('s.game_player_id, s.server_id, s.game_id, s.user_id')
                 ->having($having)
                 ->buildSql();
             $query = M()->alias('record')

From 9b65fbaabbeb603abc545b1a522034e6391f4750 Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Thu, 26 Dec 2019 17:30:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/ExportController.class.php   | 4 ++++
 .../Admin/Controller/SuperStatisticalController.class.php | 3 +++
 Application/Admin/View/SuperStatistical/superDetail.html  | 8 ++++++++
 3 files changed, 15 insertions(+)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 5f1d4568b..5825a0213 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -2049,6 +2049,9 @@ class ExportController extends Controller
                             if (isset($params['order_id'])) {
                                 $map['tab_game_supersign.order_id'] = $params['order_id'];
                             }
+                            if (isset($params['pay_way'])) {
+                                $map['tab_game_supersign.pay_way'] = $params['pay_way'];
+                            }
                             if (isset($params['account'])) {
                                 $map['tab_user.account'] = $params['account'];
                             }
@@ -2166,6 +2169,7 @@ class ExportController extends Controller
                                 $map['tab_repair_pay.create_time'] = array('BETWEEN', [$startTime, $endTime]);
                             }
 
+
                             if(isset($params['type'])) {
                                 $map['tab_repair_pay.type'] = $params['type'];
                             }
diff --git a/Application/Admin/Controller/SuperStatisticalController.class.php b/Application/Admin/Controller/SuperStatisticalController.class.php
index 19a44ca51..ecab06174 100644
--- a/Application/Admin/Controller/SuperStatisticalController.class.php
+++ b/Application/Admin/Controller/SuperStatisticalController.class.php
@@ -132,6 +132,9 @@ class SuperStatisticalController extends ThinkController
         if (isset($params['order_id'])) {
             $map['tab_game_supersign.order_id'] = $params['order_id'];
         }
+        if (isset($params['pay_way'])) {
+            $map['tab_game_supersign.pay_way'] = $params['pay_way'];
+        }
         if (isset($params['account'])) {
             $map['tab_user.account'] = $params['account'];
         }
diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html
index b644acaee..ddd9b5dff 100644
--- a/Application/Admin/View/SuperStatistical/superDetail.html
+++ b/Application/Admin/View/SuperStatistical/superDetail.html
@@ -96,6 +96,14 @@
                     </volist>
                 </select>   
             </div>
+            <div class="input-list search_item input-list-gamenoticestatus">
+                <select name="pay_way" style="color:#444" class="select_gallery" id="promote_id">
+                    <option value="">支付方式</option>
+                    <option value="0" <?php if (isset($_GET['pay_way']) && $_GET['pay_way'] == 0):?>selected<?php endif;?>>未知</option>
+                    <option value="1" <?php if ($_GET['pay_way'] == 1):?>selected<?php endif;?>>支付宝</option>
+                    <option value="2" <?php if ($_GET['pay_way'] == '2'):?>selected<?php endif;?>>微信</option>
+                </select>
+            </div>
             <input type="hidden" name="" value="" class="sortBy">
 
             <div class="input-list search_item">

From 5cf9ad9fd12109280c7346db4839929bb5b36914 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Thu, 26 Dec 2019 17:30:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6--?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/DownloadController.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php
index 8a17b4c95..3d5ecca69 100644
--- a/Application/Home/Controller/DownloadController.class.php
+++ b/Application/Home/Controller/DownloadController.class.php
@@ -3233,7 +3233,7 @@ class DownloadController extends BaseController {
             // ->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')
             ->join('join tab_user as u on u.id = uc.user_id') 
             ->where($map)
-             ->group('uc.game_player_id,uc.server_id,uc.game_id')
+             ->group('uc.game_player_id,uc.server_id,uc.game_id,uc.user_id')
              ->buildSql();
         $roles = M()->alias('record')
             ->table($subQuery)