From 7a98ee81cbc6ea2c469ce7c6dc287d11d464e13d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 25 Dec 2019 19:55:08 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index 1675b0c4f..b18953b7e 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/Application/Admin/Controller/PayChannelController.class.php @@ -460,6 +460,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, From d31c2f28f3a3a23807667629f103e22ecf8e2e22 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 25 Dec 2019 20:08:56 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/FinanceController.class.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 23f7128e8..72e6bee61 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/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');//实付金额合计 From 3561a87d4a1da07e1675aa6fadcfce8fa88dee66 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 25 Dec 2019 20:51:27 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index d3645a96f..d94019f28 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/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]]; } From f8b570c20e978b0339c1da6bce3f599dc6b51fdc Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 25 Dec 2019 20:58:55 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B8=A0=E9=81=93?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1bug=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PayChannelController.class.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Application/Admin/Controller/PayChannelController.class.php b/Application/Admin/Controller/PayChannelController.class.php index b18953b7e..c0a53ccf6 100644 --- a/Application/Admin/Controller/PayChannelController.class.php +++ b/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) From 8615caa33fb7cbaab1abc3ba1e2b5197ecf37845 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 25 Dec 2019 20:58:57 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1-?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Finance/gameStatistics.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Finance/gameStatistics.html b/Application/Admin/View/Finance/gameStatistics.html index 11f33657e..4e241b0b6 100644 --- a/Application/Admin/View/Finance/gameStatistics.html +++ b/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(); }) From 901d780165dfc15ea65f67aa2c7b8f0199a49f1c Mon Sep 17 00:00:00 2001 From: chenzhi Date: Wed, 25 Dec 2019 21:08:23 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=B8=B8=E6=88=8F=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/FinancePromote/gameCoinDetail.html | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/Application/Admin/View/FinancePromote/gameCoinDetail.html b/Application/Admin/View/FinancePromote/gameCoinDetail.html index 4bafe9375..9995cfcc9 100644 --- a/Application/Admin/View/FinancePromote/gameCoinDetail.html +++ b/Application/Admin/View/FinancePromote/gameCoinDetail.html @@ -11,6 +11,8 @@ + +
@@ -134,6 +156,7 @@