From 9549812c41ebd02cd8b8ff5ed0a11a29a993c73f Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Dec 2019 16:51:34 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/FinancePromote/index.html       | 4 ++--
 Application/Admin/View/FinancePromote/promoteUser.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html
index 8fd8b2d59..25314ddd0 100644
--- a/Application/Admin/View/FinancePromote/index.html
+++ b/Application/Admin/View/FinancePromote/index.html
@@ -222,9 +222,9 @@
 
                                 <td>
                                     <a
-                                        href="{:U('FinancePromote/gameStatistics',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id'],'promote_type'=>1],I('get.')))}">游戏查看</a>
+                                        href="{:U('FinancePromote/gameStatistics',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id'],'promote_type'=>1],I('get.'),['p'=>1]))}">游戏查看</a>
                                     <a
-                                        href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.')))}">渠道查看</a>
+                                        href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.'),['p'=>1]))}">渠道查看</a>
                                 </td>
                             </tr>
                         </volist>
diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html
index c65fbd042..22d67b342 100644
--- a/Application/Admin/View/FinancePromote/promoteUser.html
+++ b/Application/Admin/View/FinancePromote/promoteUser.html
@@ -209,7 +209,7 @@
 
 
                                 <td>
-                                    <a href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_id'=>$data['promote_id'],'company_id'=>$data['company_id'],'promote_type'=>2]))}" >游戏查看</a>
+                                    <a href="{:U('FinancePromote/gameStatistics',array_merge(I('get.'),['promote_id'=>$data['promote_id'],'company_id'=>$data['company_id'],'promote_type'=>2,'p'=>1]))}" >游戏查看</a>
                                 </td>
                             </tr>
                         </volist>

From 6288e5e64e895d43180bcfcc0e414468fe73e7f1 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Dec 2019 16:57:31 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E6=8E=A8=E5=B9=BF=E5=91=98?=
 =?UTF-8?q?=E6=B2=A1=E6=8E=89=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/FinancePromote/gameStatistics.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html
index e4351eab5..493b6afc6 100644
--- a/Application/Admin/View/FinancePromote/gameStatistics.html
+++ b/Application/Admin/View/FinancePromote/gameStatistics.html
@@ -127,6 +127,9 @@
       </div>
 
       <input type="hidden" name="from" value="{$_GET['from']}"/>
+      <input type="hidden" name="promote_id" value="{$_GET['promote_id']}"/>
+      <input type="hidden" name="promote_type" value="{$_GET['promote_type']}"/>
+      
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('FinancePromote/gameStatistics','model='.$model['name'].'&row='.I('row'),false)}"
            style="width: 100px;border: #3C95C8 solid 1px;">搜索</a>

From a6ad40b45a7b5248213819bab0a0b2b7886ee014 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Dec 2019 17:00:22 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/FinancePromote/gameStatistics.html | 3 +++
 Application/Admin/View/FinancePromote/promoteUser.html    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html
index 493b6afc6..8435ed9a7 100644
--- a/Application/Admin/View/FinancePromote/gameStatistics.html
+++ b/Application/Admin/View/FinancePromote/gameStatistics.html
@@ -95,6 +95,9 @@
     <!-- 高级搜索 -->
     <div class="jssearch fl cf search_list">
       <!--游戏类型搜索END-->
+      <div class="input-list  search-title-box">
+        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+      </div>
       <div class="input-list input-list-server search_label_rehab">
         <select id="partner_id" name="partner_id" class="select_gallery"  style="width:120px;">
           <option value="">请选择合作公司</option>
diff --git a/Application/Admin/View/FinancePromote/promoteUser.html b/Application/Admin/View/FinancePromote/promoteUser.html
index 22d67b342..670441488 100644
--- a/Application/Admin/View/FinancePromote/promoteUser.html
+++ b/Application/Admin/View/FinancePromote/promoteUser.html
@@ -87,6 +87,9 @@
     <div class="cf top_nav_list">
         <!-- 高级搜索 -->
         <div class="jssearch search_list fl cf">
+            <div class="input-list  search-title-box">
+                <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+              </div>
             <div class="input-list search-title-box">
                 <label>搜索：</label>
             </div>

From 1291009a0238e80ccdd8bc0ad4de295b492e9f07 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 24 Dec 2019 17:09:07 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/FinanceController.class.php    | 10 ++---
 .../Admin/View/Finance/coinDetail.html        |  1 +
 .../Admin/View/Finance/gameStatistics.html    | 39 ++++++++++++-------
 .../View/Finance/gameStatisticsDetail.html    |  2 +-
 4 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index aed71247f..2cb9cf2ce 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/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) {
diff --git a/Application/Admin/View/Finance/coinDetail.html b/Application/Admin/View/Finance/coinDetail.html
index ce9338edc..1f4c58998 100644
--- a/Application/Admin/View/Finance/coinDetail.html
+++ b/Application/Admin/View/Finance/coinDetail.html
@@ -15,6 +15,7 @@
 <style>
     html {
         min-width:100%;
+        height: 1000px;
     }
     body {
         padding: 0px;
diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html
index ea095add9..95c02a6b0 100644
--- a/Application/Admin/View/Finance/gameStatistics.html
+++ b/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>
diff --git a/Application/Admin/View/Finance/gameStatisticsDetail.html b/Application/Admin/View/Finance/gameStatisticsDetail.html
index 400e00d37..dedd6862e 100644
--- a/Application/Admin/View/Finance/gameStatisticsDetail.html
+++ b/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']}"/>

From fac9f41dc3fcabbc4ca3634b7465b2d8adf04786 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Tue, 24 Dec 2019 17:10:25 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c13f064c2..f8f969a8c 100644
--- a/README.md
+++ b/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>
+
+## 天下游戏平台
+
+天下游戏平台，万盟天下版权所有。
\ No newline at end of file

From 964eea79e53709bbfecda8f819d8e987ba0a477a Mon Sep 17 00:00:00 2001
From: tping <tpingzhang11@126.com>
Date: Tue, 24 Dec 2019 17:18:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?1,=20=E5=B9=B3=E5=8F=B0=E5=B8=81=E8=A1=A5?=
 =?UTF-8?q?=E5=8D=95=202=EF=BC=8Crepair=5Fpay=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/RepairController.class.php     | 11 +++++++++++
 Data/update.sql                                     | 13 +++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/Application/Admin/Controller/RepairController.class.php b/Application/Admin/Controller/RepairController.class.php
index 02f23d354..05de1242c 100644
--- a/Application/Admin/Controller/RepairController.class.php
+++ b/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();
                 }
                 
diff --git a/Data/update.sql b/Data/update.sql
index ab62accb3..67f2f4060 100644
--- a/Data/update.sql
+++ b/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='通知到账补单';
\ No newline at end of file

From 795c1983ad97934d29a1d644f75d9777b5c99eae Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Tue, 24 Dec 2019 17:24:25 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=98=E6=96=B9?=
 =?UTF-8?q?=E6=B8=A0=E9=81=93=E6=B2=A1=E6=9C=89=E6=B8=A0=E9=81=93=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/View/FinancePromote/gameStatistics.html | 2 +-
 Application/Admin/View/FinancePromote/index.html          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html
index 8435ed9a7..b74f6856a 100644
--- a/Application/Admin/View/FinancePromote/gameStatistics.html
+++ b/Application/Admin/View/FinancePromote/gameStatistics.html
@@ -246,7 +246,7 @@
             shadeClose: true,
             shade: 0.8,
             area: ['70%', '80%'],
-            content: [url, 'no']
+            content: url
         });
     });
 
diff --git a/Application/Admin/View/FinancePromote/index.html b/Application/Admin/View/FinancePromote/index.html
index 25314ddd0..836fdadf4 100644
--- a/Application/Admin/View/FinancePromote/index.html
+++ b/Application/Admin/View/FinancePromote/index.html
@@ -223,8 +223,9 @@
                                 <td>
                                     <a
                                         href="{:U('FinancePromote/gameStatistics',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id'],'promote_type'=>1],I('get.'),['p'=>1]))}">游戏查看</a>
-                                    <a
-                                        href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.'),['p'=>1]))}">渠道查看</a>
+                                    <if condition="$data['p_id'] GT 0">
+                                    <a href="{:U('FinancePromote/promoteUser',array_merge(['promote_id'=>$data['p_id'],'company_id'=>$data['company_id']],I('get.'),['p'=>1]))}">渠道查看</a>
+                                    </if>
                                 </td>
                             </tr>
                         </volist>
@@ -306,7 +307,7 @@
                     shadeClose: true,
                     shade: 0.8,
                     area: ['70%', '80%'],
-                    content: [url, 'no']
+                    content: url
                 });
             });
             $(".select_gallery").select2();