From ab524feffb0ac39a9170e018b2daf46454fe8946 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:42:20 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/default/Finance/settlementDtl.html | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Application/Home/View/default/Finance/settlementDtl.html b/Application/Home/View/default/Finance/settlementDtl.html index aefcaf46a..a62bdff29 100644 --- a/Application/Home/View/default/Finance/settlementDtl.html +++ b/Application/Home/View/default/Finance/settlementDtl.html @@ -176,6 +176,24 @@ {$vo.selle_status} + + 合计 + -- + -- + -- + {$total.pay_amount} + + 0.00 + {$total.pay_amount} + + {$total.pay_amount} + 0.00 + + -- + {$total.income} + -- + -- + From 80115e9c380a8513598f7405122516d6276a9861 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:43:15 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Query/userRecharges.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html index 98b80d789..67a7f0889 100644 --- a/Application/Home/View/default/Query/userRecharges.html +++ b/Application/Home/View/default/Query/userRecharges.html @@ -167,6 +167,20 @@ {$record.promote_account} + + 合计 + -- + -- + -- + -- + -- + {$total.recharge_cost} + {$total.recharge_count} + {$total.recharge_cost_today} + -- + -- + -- + From d600886e918c2b80ea8d7cd7179f931e2af4d190 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:43:51 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/View/default/Query/recharge.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index d7a658ae1..69a1df648 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -206,6 +206,19 @@ + + 合计 + -- + -- + {$income} + -- + -- + -- + -- + -- + -- + -- + From ca5da52a4d455e885a4552291fc78738c0eeb9d0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:44:38 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/FinanceController.class.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php index f8b4e8ceb..b9d6d174f 100644 --- a/Application/Home/Controller/FinanceController.class.php +++ b/Application/Home/Controller/FinanceController.class.php @@ -182,6 +182,7 @@ class FinanceController extends BaseController $parameter['endtime'] = $initEndTime; $data = []; + $total = []; $count = 0; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $withdrawIds = []; @@ -222,6 +223,10 @@ class FinanceController extends BaseController ->page($page, $row) ->select(); $count = $model->where($map)->count(); + $total = $model->field('sum(pay_amount) as pay_amount,pay_way,sum(if(selle_ratio >= 0,selle_ratio * pay_amount,0)) as income') + ->where($map) + ->find(); + $total['income'] = bcdiv($total['income'], 100, 2); //提现状态 if (empty($withdrawIds)) { @@ -264,6 +269,7 @@ class FinanceController extends BaseController $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('_page', $page); From c5a5bc5c696bec9a1c1c14e0a94ef94282bc18e6 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:45:59 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 908a5c82e..849df3f73 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -91,6 +91,7 @@ class QueryController extends BaseController $data = []; $count = 0; + $income = '0.00'; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $data = M('Spend', 'tab_') ->field('tab_spend.*,tab_promote.account as pro_account,tab_promote.real_name as pro_real_name,tab_promote.chain as chain') @@ -105,6 +106,14 @@ class QueryController extends BaseController ->join('tab_game on tab_spend.game_id = tab_game.id') ->where($map) ->count(); + + $income = M('Spend', 'tab_') + ->field('sum(tab_spend.pay_amount) as income') + ->join('tab_game on tab_spend.game_id = tab_game.id') + ->join('left join tab_promote on tab_spend.promote_id = tab_promote.id') + ->where($map) + ->order('tab_spend.id desc') + ->find()['income']; } if (!empty($data)) { foreach ($data as &$list) { @@ -177,6 +186,7 @@ class QueryController extends BaseController } $this->assign('listData', $data); $this->assign('count', $count); + $this->assign('income', $income); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('setdate', date("Y-m-d")); From 1a2bc7b4c5f689e39533e3325c892161a9cfc887 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Mon, 2 Dec 2019 11:47:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2|=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=BB=9F=E8=AE=A1|=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E7=BB=93=E7=AE=97=E6=98=8E=E7=BB=86--?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 849df3f73..f7e04a452 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1746,6 +1746,7 @@ class QueryController extends BaseController $records = []; $pagination = ''; $count = 0; + $total = []; if (intval($endTime - $begTime) / (24 * 3600) <= 31) { $map['chain'] = ['like', $queryPromote['chain'] . $queryPromote['id'] . '/%']; $ids = M('promote', 'tab_')->where($map)->getField('id', true); @@ -1834,6 +1835,11 @@ class QueryController extends BaseController $query = M()->alias('record') ->table($subQuery) ->order($orderBy); + $total = M('user_play_data_count', 'tab_')->alias('uc') + ->field($fieldUC) + ->join('tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->where($map) + ->find(); list($records, $pagination, $count) = $this->paginate($query); @@ -1849,6 +1855,7 @@ class QueryController extends BaseController $this->assign('records', $records); $this->assign('pagination', $pagination); $this->assign('count', $count); + $this->assign('total', $total); $this->assign('initBegTime', $initBegTime); $this->assign('initEndTime', $initEndTime); $this->assign('sort', $sort);