Merge branch 'dev' of 47.111.118.107:wmtx/platform into dev

Application/Admin/Controller/FinanceController.class.php

@@ -915,7 +915,7 @@ class FinanceController extends ThinkController
         } else {
             $row = 10;
         }
-        $map['pay_status'] = 1;
+        $map['pay_game_status'] = 1;
         if (!empty(I("game_id"))) {
             $map['tab_spend.game_id'] = I("game_id");
         }
@@ -951,7 +951,6 @@ class FinanceController extends ThinkController
         $page = set_pagination($count,$row);
 
 
-        $map['pay_game_status'] = 1;
         $total_cost = D('spend')->sumSpend($map, 'cost');//订单金额合计
         $total_pay_amount = D('spend')->sumSpend($map, 'pay_amount');//实付金额合计
 

Application/Admin/Controller/MemberController.class.php

@@ -67,7 +67,7 @@ class MemberController extends ThinkController
             $map['tab_user.register_type'] = $_GET['register_way'];
         }else{
             if (I('type', 1) == 1) {
-                $map['tab_user.register_type'] = ['in', [1, 2, 7]];
+                $map['tab_user.register_type'] = ['not in', [0, 3, 4, 5, 6]];
             }else{
                 $map['tab_user.register_type'] = ['in', [0, 3, 4, 5, 6]];
             }
@@ -93,6 +93,10 @@ class MemberController extends ThinkController
             $game_map .= " and tab_user_play_info.game_id in (" . implode(',', array_column(getGameByName($_REQUEST['game_name'], $_REQUEST['game_type']), 'id')) . ")";
             
         }
+        //查询设备号
+        if (isset($_REQUEST['device_number'])) {
+            $map['tab_user.device_number'] = $_REQUEST['device_number'];
+        }
         $promoteRoot = getPowerPromoteIds();
 
 //        $data_empower_type = session('user_auth')['data_empower_type'];

Application/Admin/Controller/PayChannelController.class.php

@@ -46,6 +46,7 @@ class PayChannelController extends ThinkController
         if (!empty($_REQUEST['game_id'])) {
             $map['game_id'] = $_REQUEST['game_id'];
             $bindMap['game_id'] = $_REQUEST['game_id'];
+            $coinMap['game_id'] = $_REQUEST['game_id'];
         }
 
         $map['pay_status'] = $coinMap['pay_status'] = 1;
@@ -73,6 +74,7 @@ class PayChannelController extends ThinkController
             ->group("game_id")
             ->select();
 
+        unset($coinMap['game_id']);
         //平台币充值
         $coinSum = M('deposit','tab_')
             ->where($coinMap)
@@ -460,6 +462,7 @@ class PayChannelController extends ThinkController
             ->select(false);
 //        var_dump($spendData);die();
         $coinMap['pay_status'] = 1;
+        $coinMap['pay_source'] = 2;
         $coinData = M('pay_info','tab_')
             ->join("inner join tab_deposit on tab_pay_info.order_id=tab_deposit.pay_order_number")
             ->field("pay_order_number,tab_deposit.create_time as pay_time,tab_deposit.user_account,tab_pay_info.game_name,tab_deposit.promote_account,

Application/Admin/Controller/SuperStatisticalController.class.php

@@ -151,6 +151,8 @@ class SuperStatisticalController extends ThinkController
         $data = M('game_supersign', 'tab_')->field('tab_game_supersign.id,tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time,tab_game_supersign.pay_price')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->page($page,$row)->order('id DESC')->select();
         $count = M('game_supersign', 'tab_')->field('tab_game_supersign.order_id,tab_user.account,tab_user.promote_account,tab_user.device_number,tab_game.game_name,tab_game_supersign.pay_time')->join('tab_user on tab_game_supersign.user_id = tab_user.id')->join('tab_game on tab_game_supersign.game_id = tab_game.id')->where($map)->count();
 
+        $pay_price = M('game_supersign', 'tab_')->field('sum(pay_price) as pay_price')->where($map)->select();
+        $super_money_all = $pay_price[0]['pay_price'] == '' ? 0 : $pay_price[0]['pay_price'];
         $page = set_pagination($count, $row);
         $this->assign('_page', $page);
         $this->assign('data', $data);

Application/Admin/View/Finance/gameStatistics.html

@@ -321,7 +321,7 @@
 
       function get_game_list()
       {
-        var game_name = "{:I('game_name')}";
+        var game_name = $('#game_name').val();
         var partner_id = $("#partner_id option:selected").val();
         var sdk_type = $("#sdk_version1 option:selected").val();
         $.ajax({
@@ -411,7 +411,7 @@
       $("#game_name, #sdk_type").change(function(){
         get_partnet_list();
       });
-
+      $('#partner_id').change();
 
     })
   </script>

Application/Admin/View/FinancePromote/gameCoinDetail.html

@@ -11,6 +11,8 @@
     <link rel="stylesheet" type="text/css" href="__CSS__/style.css" media="all">
     <link rel="stylesheet" type="text/css" href="__CSS__/default_color.css" media="all">
     <script type="text/javascript" src="__STATIC__/jquery-2.0.3.min.js"></script>
+    <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+  <script type="text/javascript" src="__JS__/select2.min.js"></script>
 </head>
 <style>
     html {
@@ -19,6 +21,26 @@
     body {
         padding: 0px;
     }
+    .select2-container--default .select2-selection--single {
+      color: #000;
+      resize: none;
+      border-width: 1px;
+      border-style: solid;
+      border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+      box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+      height:28px;border-radius:3px;font-size:12px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__rendered {
+      line-height:35px;
+      line-height:28px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__arrow {
+      height:26px;
+    }
+    .select2-container--default .select2-search--dropdown .select2-search__field {
+      height:26px;line-height:26px;font-size:12px;
+    }
+    .select2-results__option[aria-selected] {font-size:12px;}
 </style>
 <body>
 <div id="main" class="main" style="min-height: 342px;">
@@ -134,6 +156,7 @@
 
 <script>
     $(function(){
+        $(".select_gallery").select2();
     //搜索功能
         $("#search").click(function(){
             console.log(222);