diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 0aaf253ed..e0ca919c0 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") + ->field("cash_count,balance_coin_count,inside_cash_count,all_count,count_date,balance_coin_deposit") ->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") + ->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") ->where($map) ->order($order) ->find(); diff --git a/Application/Admin/View/Finance/index.html b/Application/Admin/View/Finance/index.html index eb29dc186..bde7b9fc1 100644 --- a/Application/Admin/View/Finance/index.html +++ b/Application/Admin/View/Finance/index.html @@ -133,7 +133,9 @@
游戏现金流水第三方支付(微信,支付宝,快捷)
-
平台币流水平台币所支付的流水
+
平台币支出平台币游戏支付流水
+ +
平台币收入平台币收入流水
内充流水管理后台下发的所有平台币,绑定币流水(平台币订单-后台发放(玩家/推广员)),绑币订单-后台发放(玩家),平台币回收与绑币回收需要进行扣除
@@ -160,6 +162,7 @@ {$data.count_date} {$data.cash_count} {$data.balance_coin_count} + {$data.balance_coin_deposit} {$data.inside_cash_count} {$data.all_count} @@ -175,6 +178,7 @@ 总计 {$sumData.cash_count}0 {$sumData.balance_coin_count}0 + {$sumData.balance_coin_deposit}0 {$sumData.inside_cash_count}0 {$sumData.all_count}0