From 5f70aa78d8aff886a7d0eb5a1a0ad6b1dcbeaa39 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Dec 2019 11:23:33 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A5=E9=93=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MendController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MendController.class.php b/Application/Admin/Controller/MendController.class.php index 6f02ec65b..0397a1dd4 100644 --- a/Application/Admin/Controller/MendController.class.php +++ b/Application/Admin/Controller/MendController.class.php @@ -187,7 +187,7 @@ class MendController extends ThinkController { private function checkPromote($order_time,$account) { $res = M("Spend","tab_")->field("promote_id")->where(["pay_time"=>array("EGT",$order_time),"user_account"=>$account])->group("promote_id")->select(); - if(count($res)>0) return true; + if(count($res)>1) return true; return false; } //补链详情 From da5e8b9050700fc752213e7e104bf66fbefeb7f0 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 24 Dec 2019 11:54:03 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/PromoteService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/PromoteService.class.php b/Application/Base/Service/PromoteService.class.php index 28d2a1383..c513618d2 100644 --- a/Application/Base/Service/PromoteService.class.php +++ b/Application/Base/Service/PromoteService.class.php @@ -357,7 +357,7 @@ class PromoteService { 'remark' => $remark == '' ? ($task['creator_type'] == 0 ? '后台补链' : '玩家迁移') : $remark, 'order_time' => $orderTime, 'create_time' => time(), - 'pay_amount' => isset($payAmountRows[$item['id']]) ? $payAmountRows[$item['id']]['payAmount'] : 0, + 'pay_amount' => isset($payAmountRows[$item['id']]) ? intval($payAmountRows[$item['id']]['payAmount']) : 0, 'op_id' => $creator ? $creator['id'] : 0, 'op_account' => $opAccount, 'op_type' => $task['creator_type'], From d1cca460be24e04257c6ac0332005968d2637138 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Dec 2019 14:29:31 +0800 Subject: [PATCH 03/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B8=B8=E6=88=8F=E6=90=9C=E7=B4=A2=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/FinancePromote/gameStatistics.html | 4 ++-- .../Admin/View/FinancePromote/gameStatisticsDetail.html | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index 3e26b5414..e4351eab5 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -224,7 +224,7 @@ 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 @@
- 返回 + 返回
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 17/28] =?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 +

+ +## 天下游戏平台 + +天下游戏平台，万盟天下版权所有。 \ No newline at end of file From 964eea79e53709bbfecda8f819d8e987ba0a477a Mon Sep 17 00:00:00 2001 From: tping Date: Tue, 24 Dec 2019 17:18:53 +0800 Subject: [PATCH 18/28] =?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 Date: Tue, 24 Dec 2019 17:24:25 +0800 Subject: [PATCH 19/28] =?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 @@ 游戏查看 - 渠道查看 + + 渠道查看 + @@ -306,7 +307,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url, 'no'] + content: url }); }); $(".select_gallery").select2(); From bd39f880fecda2e7b038eefa7edda966b280bb04 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 24 Dec 2019 17:33:41 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/FinanceController.class.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 88e78320a..6c1652e74 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1001,12 +1001,12 @@ class FinanceController extends ThinkController } elseif (empty($_REQUEST['timestart']) && !empty($_REQUEST['timeend'])) { $time = array('elt', (strtotime($_REQUEST['timeend']) + 86399)); } - setPowerPromoteIds($map); +// setPowerPromoteIds($map); //获取现金充值 $cashStatistics = M('spend', 'tab_') ->field('pay_way,"" as pay_type,SUM(pay_amount) AS pay_amount') - ->where(['pay_status' => 1,'pay_way'=>['egt',1],'pay_time'=>$time,'promote_id'=>$map['promote_id']]) + ->where(['pay_status' => 1,'pay_way'=>['egt',1],'pay_time'=>$time]) ->group('pay_way') ->select(); foreach ($cashStatistics as $key => $value) { @@ -1022,7 +1022,6 @@ class FinanceController extends ThinkController 'tab_deposit.pay_way' => ['gt', 0], 'extend'=>['eq',''] ,'tab_deposit.create_time'=>$time, - 'tab_deposit.promote_id'=>$map['promote_id'] ])->field('tab_deposit.pay_way,"" as pay_type, SUM(tab_deposit.pay_amount) AS balance') ->join("inner join tab_pay_info on tab_pay_info.order_id=tab_deposit.pay_order_number") ->group('tab_deposit.pay_way') @@ -1061,8 +1060,7 @@ class FinanceController extends ThinkController ->where([ 'pay_status' => 1, 'pay_way' => ['gt', 0], - 'create_time'=>$time, - 'promote_id'=>$map['promote_id'] + 'create_time'=>$time ]) ->group('pay_way') ->select(); @@ -1087,8 +1085,7 @@ class FinanceController extends ThinkController ->field("pay_way,'' as pay_type,sum(real_amount) as pay_amount") ->where([ 'order_status'=>['egt',1], - 'pay_way'=>['egt',1],'pay_time'=>$time, - 'promote_id'=>$map['promote_id'] + 'pay_way'=>['egt',1],'pay_time'=>$time ]) ->group('pay_way') ->select(); @@ -1118,8 +1115,7 @@ class FinanceController extends ThinkController 'pay_status'=>1, 'pay_way'=>['egt',1], 'pay_source'=>0, - 'create_time'=>$time, - 'promote_id'=>$map['promote_id'] + 'create_time'=>$time ]) ->group('pay_way') ->select(); From 44407cdb8901d53f83a396cf2b4a47f48067b428 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Tue, 24 Dec 2019 17:36:56 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=AC=E5=8F=B8=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/FinancePromote/gameStatistics.html | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/Application/Admin/View/FinancePromote/gameStatistics.html b/Application/Admin/View/FinancePromote/gameStatistics.html index b74f6856a..3ae3429f6 100644 --- a/Application/Admin/View/FinancePromote/gameStatistics.html +++ b/Application/Admin/View/FinancePromote/gameStatistics.html @@ -288,20 +288,6 @@ $("#search").click(); } }); - // $(".ljcz").click(function(){ - // var id = $(this).attr('data-value'); - // var game_name = "{:I('game_name')}"; - // var server_name = "{:I('server_id')}"; - // layer.open({ - // type: 2, - // title: '游戏消费记录', - // shadeClose: true, - // shade: 0.8, - // area: ['70%', '80%'], - // content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - // }); - // }); - function get_game_list() { var game_name = "{:I('game_name')}"; @@ -358,16 +344,16 @@ // console.log(str); $("#partner_id").empty(); $("#partner_id").append(str); - // $("#server_id").select2(); + $("#partner_id").select2(); } }) } - $("#game_name, #game_type").change(function(){ - get_partnet_list(); - }); + // $("#game_name, #game_type").change(function(){ + // get_partnet_list(); + // }); - $("#game_name").change(); + // $("#game_name").change(); }) From ea3cdf26d8bdfd307dab3416477bda03345f6554 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 24 Dec 2019 17:42:35 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=88=E4=BD=9C=E5=85=AC=E5=8F=B8=E4=B8=8E?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=81=94=E5=8A=A8=20=E7=9B=B4=E5=85=85?= =?UTF-8?q?=E6=94=AF=E5=87=BA=E6=98=8E=E7=BB=86=E5=A4=9A=E6=9D=A1=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=AF=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/View/Finance/gameStatistics.html | 36 ++++++------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 95c02a6b0..c105152c1 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -276,7 +276,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: [url, 'no'] + content: url }); }); @@ -318,21 +318,8 @@ $("#search").click(); } }); - $(".ljcz").click(function(){ - var id = $(this).attr('data-value'); - var game_name = "{:I('game_name')}"; - var server_name = "{:I('server_id')}"; - layer.open({ - type: 2, - title: '游戏消费记录', - shadeClose: true, - shade: 0.8, - area: ['70%', '80%'], - content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url - }); - }); - /* function get_game_list() + function get_game_list() { var game_name = "{:I('game_name')}"; var partner_id = $("#partner_id option:selected").val(); @@ -353,14 +340,18 @@ // console.log(str); $("#game_name").empty(); $("#game_name").append(str); - // $("#server_id").select2(); + $("#game_name").select2(); } }) } $("#partner_id, #sdk_type").change(function(){ get_game_list(); - });*/ + }); + + $("#game_name, #sdk_type").change(function(){ + get_partnet_list(); + }); $('#time-start').datetimepicker({ format: 'yyyy-mm-dd', @@ -396,11 +387,9 @@ return false; }); - /* $("#partner_id").change(); - function get_partnet_list() { - var partner_id = "{:I('partner_id')}"; + var partner_id = $('#partner_id').val(); $.ajax({ url:"{:U('Finance/getPartnetList')}", type:"post", @@ -414,7 +403,7 @@ // console.log(str); $("#partner_id").empty(); $("#partner_id").append(str); - // $("#server_id").select2(); + $("#partner_id").select2(); } }) @@ -423,11 +412,6 @@ get_partnet_list(); }); - $("#game_name").change(); - if ("{:I('get.game_name')}") { - $('#select2-game_name-container').text("{:I('get.game_name')}"); - }*/ - }) From 3244238849ac24dcdf923c1d981c117c30576e64 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 24 Dec 2019 17:46:09 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/gameStatistics.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index c105152c1..11f33657e 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/Application/Admin/View/Finance/gameStatistics.html @@ -92,7 +92,7 @@