From 10c8066469ca5cd746b4503a4dcc416369f596eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Sat, 27 Sep 2025 17:40:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E9=9C=80=E6=B1=82=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adminapi/controller/Statistical.php | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/application/adminapi/controller/Statistical.php b/application/adminapi/controller/Statistical.php index 5070931..f72fd5f 100644 --- a/application/adminapi/controller/Statistical.php +++ b/application/adminapi/controller/Statistical.php @@ -259,9 +259,14 @@ class Statistical extends adminApi ->select(); foreach ($lists as $key => $value) { $room = db::name('vs_room')->where('id', $value['from_id'])->find(); + if($room){ + $lists[$key]['room_name'] = $room['room_name'].'-'.$room['room_number']; + $lists[$key]['room_number'] = $room['room_number']; + }else{ + $lists[$key]['room_name'] = "--"; + $lists[$key]['room_number'] = "--"; + } $lists[$key]['createtime'] = date('Y-m-d H:i:s', $value['createtime']); - $lists[$key]['room_name'] = $room['room_name']??"".'-'.$room['room_number']?? ""; - $lists[$key]['room_number'] = $room['room_number']?? ""; $lists[$key]['room_cover'] = db::name('vs_room')->where('id', $value['from_id'])->value('room_cover'); $label = db::name('vs_room')->where('id', $value['from_id'])->value('label_id'); $lists[$key]['label'] = db::name('vs_room_label')->where('id', $label)->value('label_name'); @@ -346,19 +351,19 @@ class Statistical extends adminApi ]; //总收入 $wherew=[]; - $return_data['total_money'] = db::name('vs_user_recharge')->sum('money'); + $return_data['total_money'] = db::name('vs_user_recharge')->where($where)->sum('money'); //未支付 - $return_data['unpaid_money'] = db::name('vs_user_recharge')->where('pay_status',1)->sum('money'); + $return_data['unpaid_money'] = db::name('vs_user_recharge')->where($where)->where('pay_status',1)->sum('money'); //已支付 - $return_data['paid_money'] = db::name('vs_user_recharge')->where('pay_status',2)->sum('money'); + $return_data['paid_money'] = db::name('vs_user_recharge')->where($where)->where('pay_status',2)->sum('money'); //微信支付 $wherew['pay_type'] = ['in', [1,4]]; - $return_data['wx_money'] = db::name('vs_user_recharge')->where('pay_status',2)->where($wherew)->sum('money'); + $return_data['wx_money'] = db::name('vs_user_recharge')->where($where)->where('pay_status',2)->where($wherew)->sum('money'); //支付宝支付 $wherez['pay_type'] = ['in', [2,3]]; - $return_data['ali_money'] = db::name('vs_user_recharge')->where('pay_status',2)->where($wherez)->sum('money'); + $return_data['ali_money'] = db::name('vs_user_recharge')->where($where)->where('pay_status',2)->where($wherez)->sum('money'); //金币数量 - $return_data['gold_num'] = db::name('vs_user_recharge')->where('pay_status',2)->sum('coin'); + $return_data['gold_num'] = db::name('vs_user_recharge')->where($where)->where('pay_status',2)->sum('coin'); return V(1,"成功", $return_data); }