diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php index 49bf60ecb..22631c5e9 100644 --- a/Application/Admin/Controller/QueryController.class.php +++ b/Application/Admin/Controller/QueryController.class.php @@ -123,6 +123,7 @@ class QueryController extends ThinkController $this->display(); } } elseif ($group == 2) { + $map = '1 = 1'; $createTime = strtotime(I('create_time', '')); if ($createTime) { $createTimeEnd = $createTime + 3600 * 24 - 1; @@ -132,7 +133,20 @@ class QueryController extends ThinkController $map['promote_id'] = $promoteId; } - $records = M('withdraw', 'tab_'); + $records = M('withdraw', 'tab_')->where($map)->select(); + if (!empty($records)) { + foreach ($records as &$record) { + $record['settlement_begin_time'] = date('Y-m-d H:i:s', $record['settlement_begin_time']); + $record['settlement_end_time'] = date('Y-m-d H:i:s', $record['settlement_end_time']); + $record['create_time'] = date('Y-m-d H:i:s', $record['create_time']); + $record['status_text'] = promoteWithdrawStatus($record['status']); + if ($record['status'] == -2) { + $record['status_text'] = '' . $record['status_text'] . ''; + } + } + } + + $this->assign('records', $records); $this->display(); } } diff --git a/Application/Admin/View/Query/settlement.html b/Application/Admin/View/Query/settlement.html index 4e409a67a..3bc44d840 100644 --- a/Application/Admin/View/Query/settlement.html +++ b/Application/Admin/View/Query/settlement.html @@ -152,22 +152,25 @@ 结算开始时间 结算截止时间 提现时间 - 详情 + 提现状态 + 说明 操作 - + - {$data.settlement_number} - {$data.total_money} - {$data.create_time|date='Y-m-d',###} - {$data.create_time|date='Y-m-d',###} - {$data.create_time|date='Y-m-d',###} - {$data.create_time|date='Y-m-d',###} - {$data.create_time|date='Y-m-d',###} + {$record.promote_account} + {$record.widthdraw_number} + {$record.sum_money} + {$record.settlement_begin_time} + {$record.settlement_end_time} + {$record.create_time} + {$record.status_text} + {$record.respond} +