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

Application/Admin/Controller/FinanceController.class.php

@@ -759,7 +759,7 @@ class FinanceController extends ThinkController
     }
 
     public function gameStatisticsDetail($p = 1) {
-        set_time_limit(0);
+
 
         if (isset($_REQUEST['pay_way'])) {
             $map['pay_way'] = $_REQUEST['pay_way'];
@@ -831,6 +831,7 @@ class FinanceController extends ThinkController
         $order = "pay_time DESC";
 
         $data = D('spend')->getSpendData($map,$field,$group,$order,$page,$row);
+
         foreach($data as $key => $value) {
             $data[$key]['pay_way'] = getPayType($value['pay_way']);
         }
@@ -847,16 +848,15 @@ class FinanceController extends ThinkController
         $this->assign('sumInside', $sumInside);
         $this->assign('sumAll', null_to_0($sumAll));
 
-        $count = D("spend")->getSpendData($map,$field,$group,$order);
+        $count = D("spend")->getSpendData($map,'count(*) as count',$group,$order);
 
-        $count = count($count);
+        $count = $count[0]['count'];
         $page = set_pagination($count,$row);
         if($page) {$this->assign('_page', $page);}
         $this->meta_title = '游戏订单查看';
 
         $this->assign('data',$data);
-        $from = I('from', '');
-        $this->display($from);
+        $this->display();
     }
 
     public function coinDetail($p = 1) {

Application/Admin/Controller/RepairController.class.php

@@ -166,6 +166,17 @@ class RepairController extends ThinkController {
                         M($tab, 'tab_')->commit();
                     }
                 } else { // deposit
+                    $user = M("user","tab_");
+                    $r = $user->where("id=".$order['user_id'])->setInc("balance", $order['pay_amount']);
+                    if ($r === false) {
+                        M($tab, 'tab_')->rollback();
+                        $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误.'));
+                    }
+                    $r = $user->where("id=".$order['user_id'])->setInc("cumulative", $order['pay_amount']);
+                    if ($r === false) {
+                        M($tab, 'tab_')->rollback();
+                        $this->ajaxReturn(array('status'=>1,'msg'=>'数据有误..'));
+                    }
                     M('spend', 'tab_')->commit();
                 }
                 

Application/Admin/View/Finance/coinDetail.html

@@ -15,6 +15,7 @@
 <style>
     html {
         min-width:100%;
+        height: 1000px;
     }
     body {
         padding: 0px;

Application/Admin/View/Finance/gameStatistics.html

@@ -65,7 +65,9 @@
       visibility: visible;
       line-height: 20px;
     }
-
+    .layui-layer{
+      overflow: scroll;
+    }
   </style>
 
 
@@ -91,9 +93,10 @@
       <div class="input-list input-list-game search_label_rehab">
         <select id="game_name" name="game_name" class="select_gallery" >
           <option value="">游戏名称</option>
-          <!-- <volist name=":get_game_list(null, $_GET['game_type'])" id="vo">
-              <option game-id="{$vo.id}" value="{$vo.id}">{$vo.game_name}</option>
-          </volist> -->
+          <volist name=":getAllGame()" id="vo">
+            <option value="{$vo.game_name}" <if condition="$vo.game_name eq I('game_name')">selected</if>
+            >{$vo.game_name}</option>
+          </volist>
         </select>
       </div>
       <div class="input-list input-list-game search_label_rehab">
@@ -253,9 +256,11 @@
     <volist name=":I('get.')" id="vo">
       Think.setValue('{$key}',"{$vo}");
     </volist>
+    $(".select_gallery").select2();
   </script>
   <script type="text/javascript">
-    $(".select_gallery").select2();
+
+
     function reloadIframe(url) {
       $("iframe").attr('src', url);
       // document.getElementsByTagName('iframe').src=url;
@@ -280,25 +285,23 @@
       var href = $(this).attr('href');
       $(this).removeAttr('href');
       window.location.replace(href)
-      console.log(href)
     });
 
     //导航高亮
     highlight_subnav('{:U('Finance/gameStatistics')}');
     $(function(){
-
       //搜索功能
       $("#search").click(function(){
-        console.log(111);
         var starttime = $.trim($('#time-start').val());
         var endtime = $.trim($('#time-end').val());
 
         if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
 
-
         var url = $(this).attr('url');
         var query  = $('.jssearch').find('input').serialize();
+        console.log(url);
         query  += "&" + $('.jssearch').find('select').serialize();
+        console.log(query);
         query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
         query = query.replace(/^&/g,'');
         if( url.indexOf('?')>0 ){
@@ -329,13 +332,18 @@
         });
       });
 
-      function get_game_list()
+    /*  function get_game_list()
       {
         var game_name = "{:I('game_name')}";
+        var partner_id = $("#partner_id option:selected").val();
+        var sdk_type = $("#sdk_version1 option:selected").val();
         $.ajax({
           url:"{:U('Finance/getGameList')}",
           type:"post",
-          data:{partner_id:$("#partner_id option:selected").val(), sdk_type:$("#sdk_version1 option:selected").val()},
+          data:{
+            partner_id:partner_id,
+            sdk_type:sdk_type
+          },
           dataType:'json',
           success:function(data){
             var str = "<option value=''>请选择游戏</option>";
@@ -352,7 +360,7 @@
       }
       $("#partner_id, #sdk_type").change(function(){
         get_game_list();
-      });
+      });*/
 
       $('#time-start').datetimepicker({
         format: 'yyyy-mm-dd',
@@ -388,7 +396,7 @@
         return false;
       });
 
-      $("#partner_id").change();
+    /*  $("#partner_id").change();
 
       function get_partnet_list()
       {
@@ -416,6 +424,11 @@
       });
 
       $("#game_name").change();
+      if ("{:I('get.game_name')}") {
+        $('#select2-game_name-container').text("{:I('get.game_name')}");
+      }*/
+
+
     })
   </script>
 </block>

Application/Admin/View/Finance/gameStatisticsDetail.html

@@ -41,7 +41,7 @@
       <!--游戏类型搜索END-->
 
       <div class="input-list">
-        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+        <a class="sch-btn" href="{:U('Finance/gameStatistics')}" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
       </div>
       <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
       <input type="hidden" name="game_id" value="{$_GET['game_id']}"/>

Data/update.sql

@@ -894,3 +894,16 @@ ADD COLUMN `event_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '事件是否通
 -- 菜单添加补单记录
 INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `is_dev`, `status`) VALUES ('补单记录管理', 137, 0, 'BehaviorLog/singleSupplement', 0, '', '游戏订单', 0, 1);
 
+
+-- 增加通知到账 tping
+CREATE TABLE `tab_repair_pay` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `admin_id` int(11) NOT NULL DEFAULT '0',
+  `admin_name` varchar(255) NOT NULL DEFAULT '',
+  `pay_order_number` varchar(255) NOT NULL DEFAULT '',
+  `ip` varchar(255) NOT NULL DEFAULT '',
+  `tab` varchar(255) NOT NULL DEFAULT '' COMMENT '订单表：spend,deposit',
+  `create_time` int(11) NOT NULL DEFAULT '0',
+  `type` int(11) DEFAULT '0' COMMENT '0通知到账 1补单记录',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单';

README.md

@@ -1 +1,5 @@
-# cq_new_sy4.0_sdk_cha
+<p align="center"><img src="https://wmtx-test.oss-cn-hangzhou.aliyuncs.com/icon/5da6b8c08b69a.png" width="400"></p>
+
+## 天下游戏平台
+
+天下游戏平台，万盟天下版权所有。