';
+ echo '' . esc_html($number !== '' ? $number : '#' . $id) . ''
+ . '' . esc_html(sprintf(__('%s 申请', 'aksrt'), (string) ($row['created_at'] ?? ''))) . ' | ';
+ echo '' . NativeUi::user_cell($user_id) // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ . ' ' . esc_html(sprintf(__('来源：%s', 'aksrt'), $source_label)) . ' | ';
+
+ echo '' . esc_html($this->format_money($net)) . ''
+ . ' ' . esc_html(sprintf(
+ /* translators: 1 gross 2 fee 3 fee percent */
+ __('申请 %1$s · 手续费 %2$s（%3$d%%）', 'aksrt'),
+ $this->format_money($gross),
+ $this->format_money($this->fee_decimal($gross, $net)),
+ (int) ($row['fee_rate'] ?? 0)
+ )) . ' | ';
+
+ echo '' . esc_html($method_label) . '';
+ if ($account !== '') {
+ echo '';
+ }
+ echo ' | ';
+
+ $processed = (string) ($row['processed_at'] ?? '');
+ echo '' . NativeUi::status_badge($status, $this->status_badge_map()) // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ . ($processed !== '' ? ' ' . esc_html(sprintf(__('%s 处理', 'aksrt'), $processed)) . ' ' : '') . ' | ';
+
+ echo '' . ($note !== ''
+ ? ' ' . nl2br(esc_html($note)) . ' '
+ : '—') . ' | ';
+
+ echo '';
+ $next = $this->next_statuses($status);
+ if ($next === []) {
+ echo '— | ';
+ return;
+ }
+ $data = [
+ 'id' => (string) $id,
+ 'nonce' => wp_create_nonce('aksrt_pay_update_withdrawal_' . $id),
+ 'key' => $this->request_key_for($id, $retry_id, $retry_key),
+ 'number' => $number !== '' ? $number : '#' . $id,
+ 'user' => $user ? $user->display_name . ' #' . $user_id : '#' . $user_id,
+ 'net' => $this->format_money($net),
+ 'gross' => $this->format_money($gross),
+ 'source' => $source_label,
+ 'payee' => $method_label . ($account !== '' ? ' · ' . $account : ''),
+ ];
+ $attrs = '';
+ foreach ($data as $key => $value) {
+ $attrs .= ' data-' . $key . '="' . esc_attr($value) . '"';
+ }
+ $buttons = [
+ Withdrawal::STATUS_PROCESSING => [__('开始处理', 'aksrt'), 'button-primary'],
+ Withdrawal::STATUS_COMPLETED => [__('确认打款', 'aksrt'), 'button-primary'],
+ Withdrawal::STATUS_REJECTED => [__('拒绝', 'aksrt'), 'is-danger'],
+ ];
+ echo '';
+ foreach ($next as $target) {
+ [$label, $class] = $buttons[$target];
+ echo '';
+ }
+ echo '
';
+ }
+
+ /** 处理流程 + 当前提现策略；有待办时用警示色提醒冻结金额。 */
+ private function render_process_callout(array $stats): void {
+ $settings = class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_withdrawal_settings() : [];
+ $open = (int) ($stats['pending'] ?? 0) + (int) ($stats['processing'] ?? 0);
+ $policy = sprintf(
+ /* translators: 1 min amount 2 fee percent 3 daily count 4 daily limit */
+ __('当前策略：最低 %1$s，手续费 %2$d%%，每日 %3$d 次 / %4$s。', 'aksrt'),
+ $this->format_money((string) ($settings['min_amount'] ?? '0.00')),
+ (int) ($settings['service_charge_rate'] ?? 0),
+ (int) ($settings['daily_count'] ?? 0),
+ $this->format_money((string) ($settings['daily_limit'] ?? '0.00'))
+ );
+ $flow = __('处理流程：开始处理 → 按收款信息线下打款 → 确认打款。确认打款与拒绝都不可撤销。', 'aksrt');
+
+ echo '';
+ if ($open > 0) {
+ echo '' . esc_html(sprintf(
+ /* translators: 1 open count 2 frozen amount */
+ __('%1$d 笔申请待办，冻结中 %2$s。', 'aksrt'),
+ $open,
+ $this->format_money((string) ($stats['open_gross'] ?? '0.00'))
+ )) . ' ';
+ }
+ echo esc_html($flow . ' ' . $policy) . '
';
+ }
+
+ private function render_withdrawal_stats(array $stats): void {
+ NativeUi::stats([
+ ['label' => __('待处理', 'aksrt'), 'value' => number_format_i18n((int) ($stats['pending'] ?? 0)), 'url' => $this->page_url(['status' => Withdrawal::STATUS_PENDING]), 'icon' => 'dashicons-clock', 'tone' => 'warning'],
+ ['label' => __('处理中', 'aksrt'), 'value' => number_format_i18n((int) ($stats['processing'] ?? 0)), 'url' => $this->page_url(['status' => Withdrawal::STATUS_PROCESSING]), 'icon' => 'dashicons-update', 'tone' => 'info'],
+ ['label' => __('冻结中金额', 'aksrt'), 'value' => $this->format_money((string) ($stats['open_gross'] ?? '0.00')), 'hint' => __('待处理 + 处理中的申请毛额', 'aksrt'), 'icon' => 'dashicons-lock', 'tone' => 'warning'],
+ ['label' => __('已打款', 'aksrt'), 'value' => $this->format_money((string) ($stats['paid_net'] ?? '0.00')), 'url' => $this->page_url(['status' => Withdrawal::STATUS_COMPLETED]), 'hint' => sprintf(
+ /* translators: 1 completed count 2 fee total */
+ __('%1$s 笔 · 手续费 %2$s', 'aksrt'),
+ number_format_i18n((int) ($stats['completed'] ?? 0)),
+ $this->format_money((string) ($stats['paid_fee'] ?? '0.00'))
+ ), 'icon' => 'dashicons-yes-alt', 'tone' => 'success'],
+ ['label' => __('已拒绝', 'aksrt'), 'value' => number_format_i18n((int) ($stats['rejected'] ?? 0)), 'url' => $this->page_url(['status' => Withdrawal::STATUS_REJECTED]), 'icon' => 'dashicons-no-alt', 'tone' => 'danger'],
+ ]);
+ }
+
+ /** @param array $counts */
+ private function render_status_views(string $current, array $query_args, array $counts): void {
+ $base = array_diff_key($query_args, ['status' => true]);
+ $views = ['' => [__('全部', 'aksrt'), array_sum($counts)]];
+ foreach ($this->status_labels() as $key => $label) {
+ $views[$key] = [$label, (int) ($counts[$key] ?? 0)];
+ }
+
+ echo '';
+ }
+
+ /**
+ * @param array $filters
+ * @param array $query_args
+ */
+ private function render_filter_card(array $filters, array $query_args): void {
+ NativeUi::card_open('', '', false, 'aksrt-wd-filter-card');
+ echo '';
+ NativeUi::card_close();
+ }
+
+ /** @param array $options */
+ private function filter_select(string $name, string $label, array $options, string $current): string {
+ $html = '';
+ }
+
+ /**
+ * 共享处理弹窗：行内按钮把记录摘要、nonce 与幂等键写进来（admin-withdrawals.js），
+ * 三种目标状态各自的说明与备注要求用 data-mode 区分。
+ */
+ private function render_process_dialog(): void {
+ echo '';
+ }
+
+ /**
+ * 从请求读取并校验筛选条件；非法值一律视为未筛选。
+ *
+ * @return array{status:string,keyword:string,source:string,method:string,user_id:int,date_from:string,date_to:string}
+ */
+ private function list_filters(): array {
+ $read = static function (string $key): string {
+ return isset($_GET[$key]) ? sanitize_text_field((string) wp_unslash($_GET[$key])) : '';
+ };
+ $date = static function (string $value): string {
+ return preg_match('/^\d{4}-\d{2}-\d{2}$/', $value) === 1 ? $value : '';
+ };
+ $status = sanitize_key($read('status'));
+ $source = sanitize_key($read('source'));
+ $method = sanitize_key($read('method'));
+
+ return [
+ 'status' => isset($this->status_labels()[$status]) ? $status : '',
+ 'keyword' => trim($read('s')),
+ 'source' => isset($this->source_labels()[$source]) ? $source : '',
+ 'method' => isset($this->method_labels()[$method]) ? $method : '',
+ 'user_id' => max(0, (int) $read('user_id')),
+ 'date_from' => $date($read('date_from')),
+ 'date_to' => $date($read('date_to')),
+ ];
+ }
+}
diff --git a/src/Admin/PaymentController.php b/src/Admin/PaymentController.php
index 03593518..929900c3 100644
--- a/src/Admin/PaymentController.php
+++ b/src/Admin/PaymentController.php
@@ -18,96 +18,5 @@ class PaymentController extends ControllerBase {
public function register_routes(): void {
$this->register_section_routes('payment', 'payment');
-
- register_rest_route(self::API_NAMESPACE, '/payment/withdrawals', [
- 'methods' => 'GET',
- 'callback' => [$this, 'get_withdrawals'],
- 'permission_callback' => [$this, 'check_permission'],
- 'args' => [
- 'page' => ['type' => 'integer', 'minimum' => 1, 'default' => 1],
- 'per_page' => ['type' => 'integer', 'minimum' => 1, 'maximum' => 50, 'default' => 20],
- 'status' => ['type' => 'string', 'enum' => ['', 'pending', 'processing', 'completed', 'rejected']],
- ],
- ]);
-
- // Withdrawal status update
- register_rest_route(self::API_NAMESPACE, '/payment/withdrawals/(?P\d+)', [
- 'methods' => 'POST',
- 'callback' => [$this, 'update_withdrawal_status'],
- 'permission_callback' => [$this, 'check_permission'],
- 'args' => [
- 'id' => ['type' => 'integer', 'minimum' => 1, 'required' => true],
- 'status' => ['type' => 'string', 'required' => true, 'enum' => ['processing', 'completed', 'rejected']],
- 'note' => ['type' => 'string', 'default' => '', 'maxLength' => 1000, 'sanitize_callback' => 'sanitize_textarea_field'],
- ],
- ]);
}
-
- public function get_withdrawals(\WP_REST_Request $request): \WP_REST_Response {
- if (!class_exists('\AKSRT\Payment\Withdrawal')) {
- return $this->success(['data' => ['items' => [], 'total' => 0, 'page' => 1, 'total_pages' => 1, 'stats' => []]]);
- }
-
- $status = sanitize_key((string) $request->get_param('status'));
- $page = max(1, (int) $request->get_param('page'));
- $per_page = max(1, min(50, (int) $request->get_param('per_page'))) ?: 20;
-
- $items = \AKSRT\Payment\Withdrawal::get_instance()->get_all([
- 'status' => $status,
- 'limit' => $per_page,
- 'offset' => ($page - 1) * $per_page,
- ]);
-
- $total = \AKSRT\Payment\Withdrawal::get_instance()->get_count(['status' => $status]);
- $stats = \AKSRT\Payment\Withdrawal::get_instance()->get_stats();
-
- return $this->success([
- 'data' => [
- 'items' => $items,
- 'total' => $total,
- 'page' => $page,
- 'total_pages' => max(1, (int) ceil($total / $per_page)),
- 'stats' => $stats,
- ],
- ]);
- }
-
- /**
- * POST /payment/withdrawals/{id} — 更新提现状态
- */
- public function update_withdrawal_status(\WP_REST_Request $request): \WP_REST_Response {
- if (!class_exists('\AKSRT\Payment\Withdrawal')) {
- return $this->error('提现模块未初始化', 500);
- }
-
- $id = (int) $request->get_param('id');
- $params = $this->get_json_params($request);
- $new_status = sanitize_key((string) ($params['status'] ?? ''));
- $note = sanitize_textarea_field((string) ($params['note'] ?? ''));
-
- $valid_statuses = ['processing', 'completed', 'rejected'];
- if (!in_array($new_status, $valid_statuses, true)) {
- return $this->error('无效的提现状态');
- }
-
- if ($id <= 0) {
- return $this->error('无效的提现 ID');
- }
-
- $operation_key = \AKSRT\Ledger\OperationKey::from_request($request, 'admin-withdraw-transition', get_current_user_id());
- if (is_wp_error($operation_key)) {
- return $this->error($operation_key->get_error_message(), (int) ($operation_key->get_error_data()['status'] ?? 400));
- }
- $result = \AKSRT\Payment\Withdrawal::get_instance()->process_status_change($id, $new_status, $note, $operation_key);
-
- if (is_wp_error($result)) {
- $data = $result->get_error_data();
- return $this->error($result->get_error_message(), is_array($data) ? (int) ($data['status'] ?? 400) : 400);
- }
- if (is_array($result)) {
- return $this->success(array_merge(['message' => __('提现状态已更新', 'aksrt')], $result));
- }
- return $this->error(__('更新失败', 'aksrt'));
- }
-
}
diff --git a/src/Payment/CommissionLedger.php b/src/Payment/CommissionLedger.php
index ca523c63..25ac74c5 100644
--- a/src/Payment/CommissionLedger.php
+++ b/src/Payment/CommissionLedger.php
@@ -459,16 +459,6 @@ final class CommissionLedger {
],
],
]);
- register_rest_route('aksrt/v1', '/payment/withdrawals/(?P\d+)/transition', [
- 'methods' => \WP_REST_Server::CREATABLE,
- 'callback' => [$this, 'transition_withdrawal'],
- 'permission_callback' => [$this, 'check_admin_write_rest'],
- 'args' => [
- 'id' => ['type' => 'integer', 'minimum' => 1, 'required' => true],
- 'status' => ['type' => 'string', 'required' => true, 'enum' => ['processing', 'completed', 'rejected']],
- 'note' => ['type' => 'string', 'default' => '', 'maxLength' => 1000, 'sanitize_callback' => 'sanitize_textarea_field'],
- ],
- ]);
}
public function check_user_rest(\WP_REST_Request $request) {
return is_user_logged_in() ? true : new \WP_Error('aksrt_auth_required', __('请先登录', 'aksrt'), ['status' => 401]);
@@ -477,13 +467,6 @@ final class CommissionLedger {
$allowed = $this->check_user_rest($request);
return is_wp_error($allowed) ? $allowed : $this->verify_rest_nonce($request);
}
- public function check_admin_rest(\WP_REST_Request $request) {
- return current_user_can('manage_options') ? true : new \WP_Error('aksrt_admin_forbidden', __('无权执行此操作', 'aksrt'), ['status' => 403]);
- }
- public function check_admin_write_rest(\WP_REST_Request $request) {
- $allowed = $this->check_admin_rest($request);
- return is_wp_error($allowed) ? $allowed : $this->verify_rest_nonce($request);
- }
private function verify_rest_nonce(\WP_REST_Request $request) {
$nonce = (string) $request->get_header('X-WP-Nonce');
return $nonce !== '' && wp_verify_nonce($nonce, 'wp_rest')
@@ -545,16 +528,6 @@ final class CommissionLedger {
if (!in_array($method,(array)$settings['payout_channels'],true) || $account==='') return new \WP_Error('affiliate_withdraw_account',__('请提供有效的收款渠道和收款码。','aksrt'),['status'=>400]);
$result=\AKSRT\Payment\Withdrawal::get_instance()->create_balance_request($user_id,$amount->minor(),$method,$account,$settings,$operation_key,$source); if(is_wp_error($result)) return $result; return new \WP_REST_Response(['success'=>true,'data'=>$result],201);
}
- public function admin_withdrawals(array $args): array { $service=\AKSRT\Payment\Withdrawal::get_instance(); return ['items'=>$service->get_all(['status'=>sanitize_key((string)($args['status']??'')),'limit'=>max(1,min(100,(int)($args['per_page']??20))),'offset'=>max(0,((int)($args['page']??1)-1)*max(1,(int)($args['per_page']??20)))]),'stats'=>$service->get_stats()]; }
- public function transition_withdrawal(\WP_REST_Request $request): \WP_REST_Response|\WP_Error {
- $operation_key = \AKSRT\Ledger\OperationKey::from_request($request, 'admin-withdraw-transition', get_current_user_id());
- if (is_wp_error($operation_key)) return $operation_key;
- $status = sanitize_key((string) $request->get_param('status'));
- $result = \AKSRT\Payment\Withdrawal::get_instance()->process_status_change((int) $request['id'], $status, (string) $request->get_param('note'), $operation_key);
- if (is_wp_error($result)) return $result;
- $data = is_array($result) ? $result : [];
- return new \WP_REST_Response(array_merge(['success' => true, 'status' => $status], $data), 200);
- }
private function balance_decimal(string $value): string {
try {
return \AKSRT\Ledger\AssetAmount::balance($value)->decimal();
diff --git a/src/Payment/Withdrawal.php b/src/Payment/Withdrawal.php
index 98e22931..4eeb4811 100644
--- a/src/Payment/Withdrawal.php
+++ b/src/Payment/Withdrawal.php
@@ -319,28 +319,6 @@ class Withdrawal {
return is_array($row) ? $row : null;
}
- /**
- * 更新提现状态（无余额副作用）。优先使用 process_status_change()。
- */
- public function update_status(int $withdrawal_id, string $new_status, string $note = ''): bool {
- global $wpdb;
-
- $update = ['status' => sanitize_key($new_status)];
- $format = ['%s'];
-
- if ($new_status === self::STATUS_COMPLETED || $new_status === self::STATUS_REJECTED) {
- $update['processed_at'] = current_time('mysql');
- $format[] = '%s';
- }
-
- if ($note !== '') {
- $update['note'] = sanitize_textarea_field($note);
- $format[] = '%s';
- }
-
- return $wpdb->update($this->table(), $update, ['id' => $withdrawal_id], $format, ['%d']) !== false;
- }
-
/**
* Status transition with balance side-effects.
* Reject of balance-source holds refunds gross_amount once (idempotent).
@@ -519,8 +497,7 @@ class Withdrawal {
// Notify only after the financial transaction has committed.
$replayed = ($ledger_result instanceof \AKSRT\Ledger\LedgerResult && $ledger_result->replayed) || is_array($operation_replay);
if (class_exists('\AKSRT\Messages\Message') && $user_id > 0 && in_array($new_status, [self::STATUS_COMPLETED, self::STATUS_REJECTED], true) && !$replayed) {
- $gross = $this->resolve_gross_amount($row, $meta);
- $amount_txt = $gross;
+ $amount_txt = $this->database_balance_decimal((string) ($row['gross_amount'] ?? '0'));
if ($new_status === self::STATUS_REJECTED) {
$title = __('提现已拒绝', 'aksrt');
$body = sprintf(__('您申请提现 %s 元已被拒绝，冻结金额已退回钱包。', 'aksrt'), $amount_txt);
@@ -556,28 +533,6 @@ class Withdrawal {
return \AKSRT\Ledger\AssetAmount::from_minor($asset, $minor)->decimal();
}
- /**
- * Whether user has open (pending/processing) withdrawals.
- */
- public function has_open_withdrawal(int $user_id): bool {
- return $this->count_open($user_id) > 0;
- }
-
- /**
- * Count open withdrawals.
- */
- public function count_open(int $user_id): int {
- global $wpdb;
- if ($user_id <= 0) {
- return 0;
- }
- return (int) $wpdb->get_var($wpdb->prepare(
- "SELECT COUNT(*) FROM {$this->table()}
- WHERE user_id = %d AND status IN ('pending','processing')",
- $user_id
- ));
- }
-
/**
* Sum of frozen gross amounts still open (balance source).
*/
@@ -704,6 +659,11 @@ class Withdrawal {
$where[] = 'account_info LIKE %s';
$params[] = '%' . $wpdb->esc_like('"source":"' . $source . '"') . '%';
}
+ $method = sanitize_key((string) ($args['method'] ?? ''));
+ if ($method !== '') {
+ $where[] = 'method = %s';
+ $params[] = $method;
+ }
$keyword = trim(sanitize_text_field((string) ($args['keyword'] ?? '')));
if ($keyword !== '') {
$like = '%' . $wpdb->esc_like($keyword) . '%';
@@ -734,6 +694,12 @@ class Withdrawal {
return [$where, $params];
}
+ /**
+ * 全站统计：各状态条数；open_gross 为待处理 + 处理中仍冻结的申请毛额，
+ * paid_net / paid_fee 为已完成申请的到账净额与手续费合计。
+ *
+ * @return array{total:int,pending:int,processing:int,completed:int,rejected:int,open_gross:string,paid_net:string,paid_fee:string}
+ */
public function get_stats(): array {
global $wpdb;
@@ -744,7 +710,9 @@ class Withdrawal {
SUM(CASE WHEN status = 'processing' THEN 1 ELSE 0 END) as processing,
SUM(CASE WHEN status = 'rejected' THEN 1 ELSE 0 END) as rejected,
SUM(CASE WHEN status = 'completed' THEN 1 ELSE 0 END) as completed,
- COALESCE(SUM(CASE WHEN status = 'completed' THEN amount ELSE 0 END), 0) as total_paid
+ COALESCE(SUM(CASE WHEN status IN ('pending','processing') THEN gross_amount ELSE 0 END), 0) as open_gross,
+ COALESCE(SUM(CASE WHEN status = 'completed' THEN amount ELSE 0 END), 0) as paid_net,
+ COALESCE(SUM(CASE WHEN status = 'completed' THEN gross_amount - amount ELSE 0 END), 0) as paid_fee
FROM {$this->table()}",
ARRAY_A
);
@@ -755,19 +723,42 @@ class Withdrawal {
'processing' => (int) ($row['processing'] ?? 0),
'rejected' => (int) ($row['rejected'] ?? 0),
'completed' => (int) ($row['completed'] ?? 0),
- 'total_paid' => $this->database_balance_decimal((string) ($row['total_paid'] ?? '0')),
+ 'open_gross' => $this->database_balance_decimal((string) ($row['open_gross'] ?? '0')),
+ 'paid_net' => $this->database_balance_decimal((string) ($row['paid_net'] ?? '0')),
+ 'paid_fee' => $this->database_balance_decimal((string) ($row['paid_fee'] ?? '0')),
];
}
+ /**
+ * 后台筛选条件下各状态的条数（忽略 status 参数）：状态视图计数与当前视图总数共用一次查询。
+ *
+ * @return array
+ */
+ public function get_status_counts(array $args = []): array {
+ global $wpdb;
+ unset($args['status']);
+ [$where, $params] = $this->build_admin_filters($args);
+ $where_sql = $where ? ' WHERE ' . implode(' AND ', $where) : '';
+ $sql = "SELECT status, COUNT(*) AS c FROM {$this->table()}{$where_sql} GROUP BY status";
+ $rows = (array) ($params ? $wpdb->get_results($wpdb->prepare($sql, $params), ARRAY_A) : $wpdb->get_results($sql, ARRAY_A));
+ $counts = array_fill_keys([self::STATUS_PENDING, self::STATUS_PROCESSING, self::STATUS_COMPLETED, self::STATUS_REJECTED], 0);
+ foreach ($rows as $row) {
+ $status = (string) ($row['status'] ?? '');
+ if (isset($counts[$status])) {
+ $counts[$status] = (int) ($row['c'] ?? 0);
+ }
+ }
+ return $counts;
+ }
+
/**
* @param array $row
* @return array
*/
private function normalize_row(array $row): array {
$meta = $this->parse_account_meta((string) ($row['account_info'] ?? ''));
- $gross = $this->resolve_gross_amount($row, $meta);
$row['meta'] = $meta;
- $row['gross_amount'] = $gross;
+ $row['gross_amount'] = $this->database_balance_decimal((string) ($row['gross_amount'] ?? '0'));
$row['amount'] = $this->database_balance_decimal((string) ($row['amount'] ?? '0'));
$row['fee_rate'] = (int) ($meta['fee_rate'] ?? 0);
$display = (string) ($meta['account'] ?? $row['account_info'] ?? '');
@@ -807,15 +798,6 @@ class Withdrawal {
return $source === 'balance';
}
- /**
- * @param array $row
- * @param array $meta
- */
- private function resolve_gross_amount(array $row, array $meta): string {
- unset($meta);
- return $this->database_balance_decimal((string) ($row['gross_amount'] ?? '0'));
- }
-
private function merge_note(string $old, string $new): string {
$new = sanitize_textarea_field($new);
if ($new === '') {
diff --git a/tests/admin/pay-pages-pagination.test.cjs b/tests/admin/pay-pages-pagination.test.cjs
index 8a7b80db..ea6b0a3f 100644
--- a/tests/admin/pay-pages-pagination.test.cjs
+++ b/tests/admin/pay-pages-pagination.test.cjs
@@ -43,7 +43,7 @@ const pages = {
products: ['PayProducts', 'PayProductsList', 'PayProductsEditor'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n'),
coupons: read('src/Admin/Native/PayCoupons.php'),
income: ['PayIncome', 'PayIncomeList'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n'),
- withdrawals: read('src/Admin/Native/PayWithdrawals.php'),
+ withdrawals: ['PayWithdrawals', 'PayWithdrawalsList'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n'),
chargeCards,
};
@@ -143,10 +143,17 @@ test('每页都在查询前夹取页码，越界时重查一次', () => {
'创作分成必须在查询列表前完成计数与页码夹取'
);
+ // 提现审核同样先按状态计数夹取页码，再只查一次列表。
+ assert.equal(count(pages.withdrawals, /\$svc->get_all\(/g), 1, '提现审核只应查询一次列表');
+ assert.ok(
+ pages.withdrawals.indexOf('get_status_counts(') < pages.withdrawals.indexOf('if ($page_num > $pages) {')
+ && pages.withdrawals.indexOf('if ($page_num > $pages) {') < pages.withdrawals.indexOf('$svc->get_all('),
+ '提现审核必须在查询列表前完成计数与页码夹取'
+ );
+
const requeries = {
products: [/\$query\s*=\s*\$this->query_paid_posts\(/g],
coupons: [/\$svc->get_list\(/g],
- withdrawals: [/\$svc->get_all\(/g],
chargeCards: [/\$svc->get_list\(/g],
};
diff --git a/tests/widget-system/financial-flow-contract.test.cjs b/tests/widget-system/financial-flow-contract.test.cjs
index d245b226..cb0df8b3 100644
--- a/tests/widget-system/financial-flow-contract.test.cjs
+++ b/tests/widget-system/financial-flow-contract.test.cjs
@@ -59,8 +59,9 @@ test('orders have no independent flow page or visible flow number', () => {
assert.equal(fs.existsSync(path.join(root, 'src/Finance/FinancialFlowQuery.php')), false)
assert.match(payOrders, /订单明细/)
assert.doesNotMatch(payOrders, /账本流水号|资金流水号/)
- assert.match(read('src/Admin/Native/PayWithdrawals.php'), /esc_html__\('订单号'/)
- assert.doesNotMatch(read('src/Admin/Native/PayWithdrawals.php'), /esc_html__\('流水号'|提现单号/)
+ const withdrawals = ['PayWithdrawals', 'PayWithdrawalsList'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
+ assert.match(withdrawals, /esc_html__\('订单号'/)
+ assert.doesNotMatch(withdrawals, /esc_html__\('流水号'|提现单号/)
// 前台订单详情只展示公开订单号，账本流水号不下发也不展示。
assert.match(read('assets/js/order-center.js'), /\["订单号", order\.order_number\]/)
assert.doesNotMatch(read('assets/js/order-center.js'), /flow_number|账本流水号/)