Merge branch 'release-1.0.0' of 47.111.118.107:wmtx/platform into release-1.0.0

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

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

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">

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)

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')