From 4dfec50ba58149d5d996301946abd2f2815b9577 Mon Sep 17 00:00:00 2001 From: zyx Date: Tue, 5 Nov 2019 11:03:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E7=BB=93=E7=BB=9F=E8=AE=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/ExportController.class.php | 2 ++ .../Controller/FinanceController.class.php | 24 +++++++++++-------- .../Admin/View/Finance/gameFinance.html | 4 ++-- .../Admin/View/Finance/getParentUser.html | 10 +++++--- .../Admin/View/Finance/getPromoteUser.html | 10 +++++--- .../Admin/View/Finance/getRootUser.html | 10 +++++--- Application/Admin/View/Finance/index.html | 4 ++++ 7 files changed, 43 insertions(+), 21 deletions(-) diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index 89918cb2a..392ec9170 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -5444,6 +5444,8 @@ if ($key == 'model'){ foreach ($xlsData as $key => $value) { $xlsData[$key]['inside_cash_count'] = number_format($insideDataSum[$value['game_id']],2,'.',''); + $xlsData[$key]['all_cash_count'] = number_format($insideDataSum[$value['game_id']]+$xlsData[$key]['all_cash_count'],2,'.',''); + } $sumCash = D("spend_count")->sumSpendCountField($map,"cash_count"); diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index e0ca919c0..9f94d658c 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -85,7 +85,7 @@ class FinanceController extends ThinkController $order = "id DESC"; $data = M('spend_month_count','tab_') - ->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date,balance_coin_deposit") + ->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date,balance_coin_deposit,bind_coin_count") ->where($map) ->page($page,$row) ->order($order) @@ -98,7 +98,7 @@ class FinanceController extends ThinkController ->select(); $sumData = M('spend_month_count','tab_') - ->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date,sum(balance_coin_deposit) as balance_coin_deposit") + ->field("sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count,sum(all_count) as all_count,count_date,sum(balance_coin_deposit) as balance_coin_deposit,sum(bind_coin_count) as bind_coin_count") ->where($map) ->order($order) ->find(); @@ -202,6 +202,7 @@ class FinanceController extends ThinkController foreach ($data as $key => $value) { $data[$key]['inside_cash_count'] = number_format($insideDataSum[$value['game_id']],2,'.',''); + $data[$key]['all_cash_count'] = number_format($insideDataSum[$value['game_id']]+$data[$key]['all_cash_count'],2,'.',''); } $sumCash = D("spend_count")->sumSpendCountField($map,"cash_count"); @@ -328,14 +329,14 @@ class FinanceController extends ThinkController $map['parent_id'] = 0; $map['root_id'] = 0; $subQueryAll = M('spend_user_count','tab_') - ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->group('promote_id') ->page($page,$row) ->select(); $sumData = M('spend_user_count','tab_') - ->field('sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->find(); @@ -395,7 +396,7 @@ class FinanceController extends ThinkController $subQueryAll = M('spend_user_count','tab_') - ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->group('promote_id') ->page($page,$row) @@ -405,7 +406,7 @@ class FinanceController extends ThinkController } $sumData = M('spend_user_count','tab_') - ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->find(); if (empty(I("root_name"))) { @@ -413,6 +414,7 @@ class FinanceController extends ThinkController $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count'] + $parentData[0]['balance_coin_count'], 2, '.', ''); $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count'] + $parentData[0]['inside_cash_count'], 2, '.', ''); $sumData['all_count'] = number_format($sumData['all_count'] + $parentData[0]['all_count'], 2, '.', ''); + $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count'] + $parentData[0]['bind_coin_count'], 2, '.', ''); } $count = M('spend_user_count','tab_') @@ -466,7 +468,7 @@ class FinanceController extends ThinkController // var_dump($map);die(); $subQueryAll = M('spend_user_count','tab_') - ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->group('promote_id') ->page($page,$row) @@ -475,13 +477,14 @@ class FinanceController extends ThinkController $subQueryAll = array_merge($parentData,$subQueryAll); $sumData = M('spend_user_count','tab_') - ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') + ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map) ->find(); $sumData['cash_count'] = number_format($sumData['cash_count']+$parentData[0]['cash_count'],2,'.',''); $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count']+$parentData[0]['balance_coin_count'],2,'.',''); $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count']+$parentData[0]['inside_cash_count'],2,'.',''); $sumData['all_count'] = number_format($sumData['all_count']+$parentData[0]['all_count'],2,'.',''); + $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count']+$parentData[0]['bind_coin_count'],2,'.',''); $count = M('spend_user_count','tab_') ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count') @@ -544,19 +547,20 @@ class FinanceController extends ThinkController } $data = M('spend_user_count','tab_') - ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count') + ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map)->select(); $map1['parent_id'] = $data[0]['promote_id']; $map1['count_date'] = $date; $sunData = M('spend_user_count','tab_') - ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(cash_count+balance_coin_count+inside_cash_count) as all_count') + ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count') ->where($map1)->find(); $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.',''); $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.',''); $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.',''); $data[0]['all_count'] = number_format($data[0]['all_count']-$sunData['all_count'],2,'.',''); + $data[0]['bind_coin_count'] = number_format($data[0]['bind_coin_count']-$sunData['bind_coin_count'],2,'.',''); // $map['inside_cash_count'] = ['neq',0]; // $insideData = D("spend_count")->getSpendCountData($map,"promote_id,inside_cash_count as count","promote_id,count_date"); diff --git a/Application/Admin/View/Finance/gameFinance.html b/Application/Admin/View/Finance/gameFinance.html index 21ad29c6d..dec28f5a5 100644 --- a/Application/Admin/View/Finance/gameFinance.html +++ b/Application/Admin/View/Finance/gameFinance.html @@ -131,9 +131,9 @@
平台币流水平台币所支付的流水
-
内充消耗绑币消费所产生的流水
+
公会内充支出绑币消费所产生的流水
-
总流水游戏现金流水+平台币流水+内充消耗
+
总流水游戏现金流水+平台币流水+公会内充支出
操作 diff --git a/Application/Admin/View/Finance/getParentUser.html b/Application/Admin/View/Finance/getParentUser.html index bced194f8..ca0c96f48 100644 --- a/Application/Admin/View/Finance/getParentUser.html +++ b/Application/Admin/View/Finance/getParentUser.html @@ -112,11 +112,13 @@
游戏现金流水第三方支付（微信，支付宝，快捷）。
-
平台币流水平台币所支付的流水
+
平台币支出平台币所支付的流水
-
内充发放平台直接下放给公会的平台币
+
公会内充发放平台直接下放给公会的平台币
-
总流水游戏现金流水+平台币流水+内充发放
+
公会内充支出绑币消耗流水
+ +
总流水游戏现金流水+平台币支出+公会内充支出=总流水
操作 @@ -141,6 +143,7 @@ {$data.cash_count} {$data.balance_coin_count} {$data.inside_cash_count} + {$data.bind_coin_count} {$data.all_count} 游戏查看 @@ -154,6 +157,7 @@ {$sumData.cash_count} {$sumData.balance_coin_count} {$sumData.inside_cash_count} + {$sumData.bind_coin_count} {$sumData.all_count} 游戏查看 diff --git a/Application/Admin/View/Finance/getPromoteUser.html b/Application/Admin/View/Finance/getPromoteUser.html index 74ae6d1dc..385bc2a95 100644 --- a/Application/Admin/View/Finance/getPromoteUser.html +++ b/Application/Admin/View/Finance/getPromoteUser.html @@ -103,11 +103,13 @@
游戏现金流水第三方支付（微信，支付宝，快捷）。
-
平台币流水平台币所支付的流水
+
平台币支出平台币所支付的流水
-
内充发放平台直接下放给公会的平台币
+
公会内充发放平台直接下放给公会的平台币
-
总流水游戏现金流水+平台币流水+内充发放
+
公会内充支出绑币消耗流水
+ +
总流水游戏现金流水+平台币支出+公会内充支出=总流水/span>
操作 @@ -132,6 +134,7 @@ {$data.cash_count} {$data.balance_coin_count} {$data.inside_cash_count} + {$data.bind_coin_count} {$data.all_count} 游戏查看 @@ -144,6 +147,7 @@ {$sumData.cash_count} {$sumData.balance_coin_count} {$sumData.inside_cash_count} + {$sumData.bind_coin_count} {$sumData.all_count} 游戏查看 diff --git a/Application/Admin/View/Finance/getRootUser.html b/Application/Admin/View/Finance/getRootUser.html index 956e0d3fd..76862520f 100644 --- a/Application/Admin/View/Finance/getRootUser.html +++ b/Application/Admin/View/Finance/getRootUser.html @@ -113,11 +113,13 @@
游戏现金流水第三方支付（微信，支付宝，快捷）。
-
平台币流水平台币所支付的流水
+
平台币支出平台币所支付的流水
-
内充发放平台直接下放给公会的平台币
+
公会内充发放平台直接下放给公会的平台币
-
总流水游戏现金流水+平台币流水+内充发放
+
公会内充支出绑币消耗流水
+ +
总流水游戏现金流水+平台币支出+公会内充支出=总流水
操作 @@ -142,6 +144,7 @@ {$data.cash_count} {$data.balance_coin_count} {$data.inside_cash_count} + {$data.bind_coin_count} {$data.all_count} 游戏查看 组长渠道 @@ -151,6 +154,7 @@ {$sumData.cash_count} {$sumData.balance_coin_count} {$sumData.inside_cash_count} + {$sumData.bind_coin_count} {$sumData.all_count} 游戏查看 diff --git a/Application/Admin/View/Finance/index.html b/Application/Admin/View/Finance/index.html index 5c79e4f19..9573c7c43 100644 --- a/Application/Admin/View/Finance/index.html +++ b/Application/Admin/View/Finance/index.html @@ -137,6 +137,8 @@
内充流水管理后台下发的所有平台币，绑定币流水（平台币订单-后台发放（玩家/推广员）），绑币订单-后台发放（玩家）,平台币回收与绑币回收需要进行扣除
+
内充支出绑定币流水
+
平台币支出指示为玩家充值消耗平台，不计入总流水
总流水游戏现金流水+平台币收入+内充流水
@@ -163,6 +165,7 @@ {$data.cash_count} {$data.balance_coin_deposit} {$data.inside_cash_count} + {$data.bind_coin_count} {$data.balance_coin_count} {$data.all_count} @@ -179,6 +182,7 @@ {$sumData.cash_count}0 {$sumData.balance_coin_deposit}0 {$sumData.inside_cash_count}0 + {$sumData.bind_coin_count}0 {$sumData.balance_coin_count}0 {$sumData.all_count}0