diff --git a/app/admin/logic/user/UserLogic.php b/app/admin/logic/user/UserLogic.php index bb666aa0..76aa42b5 100755 --- a/app/admin/logic/user/UserLogic.php +++ b/app/admin/logic/user/UserLogic.php @@ -595,36 +595,35 @@ class UserLogic extends Logic public static function getUserRecharge($get) { - $model = new RechargeOrder(); + $model = new AccountLog(); $filter_where = []; + + if (!empty($get['sel_type'])) { + $filter_where[] = ['source_type', '=', $get['sel_type']]; + } + if (!empty($get['start_time']) && !empty($get['end_time'])) { $start_time = strtotime($get['start_time']); $end_time = strtotime($get['end_time']); - $filter_where[] = ['pay_time', 'between', [$start_time, $end_time]]; + $filter_where[] = ['create_time', 'between', [$start_time, $end_time]]; } $user = User::where('id', $get['id'])->field('user_money')->find(); $where = [ 'user_id' => $get['id'], - 'pay_status' => PayEnum::ISPAID, // 已支付的 ]; - $lists = $model::field('id, order_sn, pay_way, pay_time, order_amount') + $lists = $model::field('id, log_sn, change_amount, left_amount, create_time') ->where($filter_where) ->where($where) ->page($get['page'], $get['limit']) - ->order('pay_time desc') + ->order('create_time desc') ->select() ->toArray(); - foreach ($lists as &$v) { - $v['pay_time'] = date('Y-m-d H:i:s', $v['pay_time']); - } - $count = $model::where($filter_where)->where($where)->count(); - return [ 'count' => $count, 'lists' => $lists, diff --git a/app/admin/view/user/user/cost_details.html b/app/admin/view/user/user/cost_details.html index 9b988eb2..a43f5ad7 100755 --- a/app/admin/view/user/user/cost_details.html +++ b/app/admin/view/user/user/cost_details.html @@ -27,8 +27,9 @@