From b6649a7b9deb5911e1168b215bc35c6b990253dc Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 13 Apr 2020 19:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/FinanceController.class.php | 13 ++++++++--- .../Admin/View/Finance/valueDetail.html | 23 ++++++++++++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 8bf6417c7..f61e32448 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -1312,6 +1312,13 @@ class FinanceController extends ThinkController if ($sort == 17) { $order = 'restvalue asc'; } + + if ($sort == 19) { + $order = 'totalvalue desc'; + } + if ($sort == 20) { + $order = 'totalvalue asc'; + } $this->assign('sorting', $sort); $map5['v.pay_type'] = 1; $map5['v.create_time'] = $map['create_time']; @@ -1357,6 +1364,7 @@ class FinanceController extends ThinkController $ids = [-100]; } $allDatas = []; + foreach($datas as $key => $data) { $id = $data['id']; $account = $data['account']; @@ -1372,7 +1380,7 @@ class FinanceController extends ThinkController if(empty($deposit)) { $deposit = '0.00'; } - $promoteCoin = $data['promoteCoin']; + $promoteCoin = $data['promotecoin']; if(empty($promoteCoin)) { $promoteCoin = '0.00'; } @@ -1405,8 +1413,7 @@ class FinanceController extends ThinkController $map3['create_time'] = $map['create_time']; $map3['pay_type'] = 3; $allpromoteCoin = M('value_detail_log', 'tab_')->where($map3)->sum('value'); - $allpromoteCoin = empty($promoteCoin) ? '0.00' : number_format($allpromoteCoin,2,'.',''); - + $allpromoteCoin = empty($allpromoteCoin) ? '0.00' : number_format($allpromoteCoin,2,'.',''); $map4['create_time'] = $map['create_time']; if($_REQUEST['user_account']) { $banlace = M('value_detail_log', 'tab_')->field('user_id, after_value')->where($map4)->order('create_time desc')->limit(1)->select(); diff --git a/Application/Admin/View/Finance/valueDetail.html b/Application/Admin/View/Finance/valueDetail.html index 9fbe60267..736108e3c 100644 --- a/Application/Admin/View/Finance/valueDetail.html +++ b/Application/Admin/View/Finance/valueDetail.html @@ -106,7 +106,15 @@