后台需求调整
This commit is contained in:
@@ -259,9 +259,14 @@ class Statistical extends adminApi
|
|||||||
->select();
|
->select();
|
||||||
foreach ($lists as $key => $value) {
|
foreach ($lists as $key => $value) {
|
||||||
$room = db::name('vs_room')->where('id', $value['from_id'])->find();
|
$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]['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');
|
$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');
|
$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');
|
$lists[$key]['label'] = db::name('vs_room_label')->where('id', $label)->value('label_name');
|
||||||
@@ -346,19 +351,19 @@ class Statistical extends adminApi
|
|||||||
];
|
];
|
||||||
//总收入
|
//总收入
|
||||||
$wherew=[];
|
$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]];
|
$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]];
|
$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);
|
return V(1,"成功", $return_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user