$order */
+ private function order_amount(array $order): string {
+ if ($this->is_points_order($order)) {
+ return max(0, (int) ($order['amount'] ?? 0)) . ' ' . __('积分', 'aksrt');
+ }
+ return $this->cash_amount((string) ($order['amount'] ?? '0'), (string) ($order['currency'] ?? ''));
+ }
+
+ private function cash_amount(string $value, string $currency): string {
+ return $this->cash_decimal($value) . ' ' . strtoupper($currency !== '' ? $currency : 'CNY');
+ }
+
+ private function cash_decimal(string $value): string {
+ try {
+ return \AKSRT\Ledger\AssetAmount::balance($value)->decimal();
+ } catch (\InvalidArgumentException $e) {
+ return '0.00';
+ }
+ }
private function render_flash(): void {
if (empty($_GET['aksrt_pay_msg'])) {
return;
}
$code = sanitize_key((string) wp_unslash($_GET['aksrt_pay_msg']));
- $map = [
- 'order_updated' => __('订单状态已更新。', 'aksrt'),
- 'order_failed' => __('订单状态更新失败。', 'aksrt'),
- 'order_refunded' => __('订单已标记为已退款。', 'aksrt'),
- 'order_refund_failed' => __('订单标记退款失败。', 'aksrt'),
- 'order_refund_missing' => __('订单不存在。', 'aksrt'),
- 'order_refund_not_paid' => __('仅已支付订单可以标记退款。', 'aksrt'),
- 'order_note_updated' => __('订单备注已保存。', 'aksrt'),
- 'order_note_failed' => __('订单备注保存失败。', 'aksrt'),
- 'orders_cleared' => sprintf(
+ // 码 => [文案, 是否失败]
+ $map = [
+ 'order_updated' => [__('订单状态已更新。', 'aksrt'), false],
+ 'order_failed' => [__('订单状态更新失败，订单可能已被其他操作改变，请刷新后重试。', 'aksrt'), true],
+ 'order_refunded' => [__('订单已标记为已退款。款项请在支付渠道后台原路退回。', 'aksrt'), false],
+ 'order_refund_failed' => [__('订单标记退款失败。', 'aksrt'), true],
+ 'order_refund_missing' => [__('订单不存在。', 'aksrt'), true],
+ 'order_refund_not_paid' => [__('仅已支付订单可以标记退款。', 'aksrt'), true],
+ 'order_note_updated' => [__('运营备注已保存。', 'aksrt'), false],
+ 'order_note_failed' => [__('运营备注保存失败。', 'aksrt'), true],
+ 'orders_cleared' => [sprintf(
/* translators: %d deleted count */
__('已清理 %d 条关闭订单。', 'aksrt'),
max(0, (int) ($_GET['cleared'] ?? 0))
- ),
- 'orders_clear_empty' => __('没有可清理的关闭订单。', 'aksrt'),
- 'order_deleted' => __('订单已删除。', 'aksrt'),
- 'order_delete_failed' => __('订单删除失败（仅允许删除已关闭订单）。', 'aksrt'),
- 'shipping_updated' => __('物流状态已更新。', 'aksrt'),
- 'shipping_failed' => __('物流状态更新失败。', 'aksrt'),
- 'shipping_created' => __('发货记录已创建。', 'aksrt'),
- 'shipping_create_failed' => __('发货记录创建失败。', 'aksrt'),
+ ), false],
+ 'orders_clear_empty' => [__('没有可清理的关闭订单。', 'aksrt'), false],
+ 'order_deleted' => [__('订单已删除。', 'aksrt'), false],
+ 'order_delete_failed' => [__('订单删除失败（仅允许删除已关闭订单）。', 'aksrt'), true],
];
- if (!isset($map[$code])) {
- return;
- }
- $class = str_contains($code, 'failed') ? 'notice-error' : 'notice-success';
- echo '' . esc_html($map[$code]) . '
' . esc_html($message) . '
';
+ echo '
';
+ $this->render_detail_summary($order, $context);
+ $this->render_detail_timeline($order);
+ $this->render_detail_snapshot($order);
+ echo '
';
+
+ echo '
';
+ echo '
';
+ $this->dl_row(__('商品', 'aksrt'), $product);
+ $this->dl_row(__('商品类型', 'aksrt'), esc_html($this->product_type_label($type) . ($id > 0 ? ' · #' . $id : '')));
+ $this->dl_row(__('支付方式', 'aksrt'), esc_html($this->payment_method_label((string) ($order['payment_method'] ?? ''))));
+ $txn = (string) ($order['payment_transaction_id'] ?? '');
+ $this->dl_row(__('渠道交易号', 'aksrt'), $txn !== '' ? '' . esc_html($txn) . '' : '—');
+ echo '
';
+
+ // 金额拆分：只在有折扣 / 运费时展开，否则只显示实付。
+ $discount = (string) ($pricing['discount'] ?? '0');
+ $shipping = (string) ($pricing['shipping_fee'] ?? '0');
+ echo '';
+ if ($this->has_amount($discount) || $this->has_amount($shipping)) {
+ $this->amount_row(__('商品金额', 'aksrt'), $this->format_amount($order, (string) ($pricing['subtotal'] ?? '0')));
+ if ($this->has_amount($shipping)) {
+ $this->amount_row(__('运费', 'aksrt'), $this->format_amount($order, $shipping));
+ }
+ if ($this->has_amount($discount)) {
+ $code = (string) ($coupon['code'] ?? '');
+ $label = $code !== '' ? sprintf(__('优惠（%s）', 'aksrt'), $code) : __('优惠', 'aksrt');
+ $this->amount_row($label, '− ' . $this->format_amount($order, $discount));
+ }
+ }
+ echo '
' . esc_html__('实付金额', 'aksrt') . ''
+ . esc_html($this->order_amount($order)) . '
';
+ echo '
';
+ foreach ($events as $event) {
+ [$label, $time, $tone] = $event;
+ if ($time === '' || str_starts_with($time, '0000-00-00')) {
+ continue;
+ }
+ $planned = !empty($event[3]);
+ echo '- '
+ . '' . esc_html($label) . ($planned ? ' ' . esc_html__('（预计）', 'aksrt') . '' : '') . ''
+ . '
';
+ }
+ echo '
';
+ NativeUi::card_close();
+ }
+
+ /** 订单快照（下单时写入的结构化数据），默认折叠，供核对问题时查看。 */
+ private function render_detail_snapshot(array $order): void {
+ $meta = is_array($order['meta_payload'] ?? null) ? $order['meta_payload'] : [];
+ unset($meta['admin_note']);
+ if ($meta === []) {
+ return;
+ }
+ echo '';
+ echo '' . esc_html__('订单快照（原始数据）', 'aksrt') . '
';
+ echo ''
+ . esc_html((string) wp_json_encode($meta, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT))
+ . '
';
+ }
+
+ private function render_detail_actions(string $order_number, string $status): void {
+ $actions = $this->order_actions_html($order_number, $status, false);
+ NativeUi::card_open(__('处理订单', 'aksrt'));
+ if ($actions === '') {
+ echo '' . esc_html__('该订单已结束，没有可执行的操作。', 'aksrt') . '
';
+ } else {
+ echo '' . $actions . '
'; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ if ($status === DomainModel::ORDER_STATUS_PAID) {
+ echo '' . esc_html__('「标记退款」只改订单状态；款项需在支付渠道后台原路退回。', 'aksrt') . '
';
+ }
+ }
+ NativeUi::card_close();
+ }
+
+ private function render_detail_buyer(array $order, array $context): void {
+ $user_id = (int) ($order['user_id'] ?? 0);
+ $buyer = is_array($context['buyer'] ?? null) ? $context['buyer'] : [];
+
+ NativeUi::card_open(__('买家', 'aksrt'));
+ echo '' . NativeUi::user_cell($user_id, __('游客', 'aksrt')) . '
';
+ if ($user_id > 0) {
+ echo '';
+ $this->dl_row(__('用户名', 'aksrt'), esc_html((string) ($buyer['user_login'] ?? '')) ?: '—');
+ $this->dl_row(__('邮箱', 'aksrt'), esc_html((string) ($buyer['user_email'] ?? '')) ?: '—');
+ echo '
';
+ echo ''
+ . esc_html__('查看该用户全部订单', 'aksrt') . '
';
+ }
+ NativeUi::card_close();
+ }
+
+ private function render_detail_note(string $order_number, array $order, array $context): void {
+ $meta = is_array($order['meta_payload'] ?? null) ? $order['meta_payload'] : [];
+ $admin_note = (string) ($meta['admin_note'] ?? '');
+ $customer_note = (string) ($context['customer_note'] ?? '');
+
+ NativeUi::card_open(__('备注', 'aksrt'));
+ if ($customer_note !== '') {
+ echo '' . esc_html__('买家备注', 'aksrt') . '
' . nl2br(esc_html($customer_note)) . '
';
+ }
+ echo '';
+ NativeUi::card_close();
+ }
+
+ /** 返回列表时带回进入详情前的筛选与页码。 */
+ private function list_back_url(): string {
+ $args = $this->list_query_args($this->list_filters());
+ $paged = max(1, (int) ($_GET['paged'] ?? 1));
+ return $this->page_url(self::PAGE_SLUG, $args + ($paged > 1 ? ['paged' => $paged] : []));
+ }
+
+ /** $html 为已转义片段。 */
+ private function dl_row(string $label, string $html): void {
+ echo '' . esc_html($label) . '' . $html . ''; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ }
+
+ private function amount_row(string $label, string $value): void {
+ echo '' . esc_html($label) . '' . esc_html($value) . '
';
+ }
+
+ private function has_amount(string $value): bool {
+ return $value !== '' && (float) $value > 0;
+ }
+
+ private function format_amount(array $order, string $value): string {
+ if ($this->is_points_order($order)) {
+ return max(0, (int) $value) . ' ' . __('积分', 'aksrt');
+ }
+ return $this->cash_amount($value, (string) ($order['currency'] ?? ''));
+ }
+}
diff --git a/src/Admin/Native/PayOrdersList.php b/src/Admin/Native/PayOrdersList.php
new file mode 100644
index 00000000..8a0a26f3
--- /dev/null
+++ b/src/Admin/Native/PayOrdersList.php
@@ -0,0 +1,327 @@
+render_flash();
+
+ $filters = $this->list_filters();
+ $query_args = $this->list_query_args($filters);
+ $per_page = AdminListPagination::DEFAULT_PER_PAGE;
+ $page_num = max(1, (int) ($_GET['paged'] ?? 1));
+
+ $repo = OrderRepository::get_instance();
+ $args = $this->list_repository_args($filters);
+
+ // 各状态计数同时给出状态视图的数字与当前视图的总数，查询前就能夹取页码。
+ $counts = $repo->get_orders_status_counts($args, $filters['s']);
+ $total = $filters['status'] !== '' ? (int) ($counts[$filters['status']] ?? 0) : array_sum($counts);
+ $pages = max(1, (int) ceil($total / $per_page));
+
+ // 页码越界（手工改 URL、或筛选后总数变小）会让 offset 落到数据之外：表格空掉
+ // 且分页条不输出，只能手改 URL 退出。先夹到最后一页再查。
+ if ($page_num > $pages) {
+ $page_num = $pages;
+ }
+
+ if ($filters['status'] !== '') {
+ $args['status'] = $filters['status'];
+ }
+ $args['limit'] = $per_page;
+ $args['offset'] = ($page_num - 1) * $per_page;
+ $items = $repo->get_orders_admin($args, $filters['s']);
+ $this->prime_list_caches($items);
+
+ $this->render_status_views($filters, $query_args, $counts);
+ $this->render_filter_card($filters);
+
+ $row_args = $query_args + ($page_num > 1 ? ['paged' => $page_num] : []);
+ NativeUi::table_card_open(__('订单列表', 'aksrt'), $this->cleanup_form_html());
+ echo '';
+ echo '' . esc_html__('订单列表', 'aksrt') . '';
+ foreach ([
+ 'order' => __('订单号 / 下单时间', 'aksrt'),
+ 'user' => __('用户', 'aksrt'),
+ 'product' => __('商品', 'aksrt'),
+ 'amount' => __('金额 / 支付方式', 'aksrt'),
+ 'status' => __('状态', 'aksrt'),
+ 'paid' => __('支付时间', 'aksrt'),
+ 'actions' => __('操作', 'aksrt'),
+ ] as $key => $label) {
+ echo '| ' . esc_html($label) . ' | ';
+ }
+ echo '
';
+
+ if (!$items) {
+ $filtered = array_diff_key($query_args, ['status' => true]) !== [];
+ echo NativeUi::empty_row(7, __('暂无订单', 'aksrt'), $filtered // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+ ? __('没有符合当前筛选条件的订单，请调整或重置筛选。', 'aksrt')
+ : __('用户下单后，订单会出现在这里。', 'aksrt'));
+ }
+ foreach ($items as $row) {
+ $this->render_order_row($row, $row_args);
+ }
+
+ echo '
';
+ NativeUi::table_wrap_close();
+ AdminListPagination::render(self::PAGE_SLUG, $total, $page_num, $per_page, $query_args);
+ NativeUi::card_close();
+ }
+
+ /** @param array $row_args 列表上下文（筛选 + 页码），带进详情链接以便原样返回。 */
+ private function render_order_row(array $row, array $row_args): void {
+ $order_number = (string) ($row['order_number'] ?? '');
+ $status = (string) ($row['status'] ?? '');
+ $product_type = sanitize_key((string) ($row['product_type'] ?? ''));
+ $product_id = (int) ($row['product_id'] ?? 0);
+ $type_label = $this->product_type_label($product_type);
+ $title = $this->product_title($row);
+ $detail_url = $this->page_url(self::PAGE_SLUG, ['order' => $order_number] + $row_args);
+
+ echo '';
+ echo '| ' . esc_html($order_number) . ''
+ . ' ' . esc_html((string) ($row['created_at'] ?? '')) . ' | ';
+ echo '' . NativeUi::user_cell((int) ($row['user_id'] ?? 0), __('游客', 'aksrt')) . ' | ';
+ echo '' . esc_html($title !== '' ? $title : $type_label) . ''
+ . ' ' . esc_html($type_label . ($product_id > 0 ? ' · #' . $product_id : '')) . ' | ';
+ echo '' . esc_html($this->order_amount($row)) . ''
+ . ' ' . esc_html($this->payment_method_label((string) ($row['payment_method'] ?? ''))) . ' | ';
+ echo '' . NativeUi::status_badge($status, $this->status_badge_map()) . $this->expiry_hint($row) . ' | ';
+ $paid_at = (string) ($row['paid_at'] ?? '');
+ echo '' . ($paid_at !== '' ? esc_html($paid_at) : '—') . ' | ';
+ echo ' | ';
+ echo '
';
+ }
+
+ /** 待支付订单的到期提示；expires_at 以 UTC 存储。 */
+ private function expiry_hint(array $order): string {
+ $expires = (string) ($order['expires_at'] ?? '');
+ if (($order['status'] ?? '') !== DomainModel::ORDER_STATUS_PENDING || $expires === '') {
+ return '';
+ }
+ return '' . esc_html(sprintf(
+ /* translators: %s local expiry time */
+ __('%s 前未支付将自动关闭', 'aksrt'),
+ get_date_from_gmt($expires, 'm-d H:i')
+ )) . '
';
+ }
+
+ /**
+ * @param array $filters
+ * @param array $query_args
+ * @param array $counts
+ */
+ private function render_status_views(array $filters, 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 */
+ private function render_filter_card(array $filters): void {
+ NativeUi::card_open('', '', false, 'aksrt-orders-filter-card');
+ echo '';
+
+ // 商品 ID 只能从其它页面深链进来（付费文章 / 文章列表的「订单」入口），表单里没有输入框，
+ // 用可移除的标签提示它正在生效。
+ if ($filters['product_id'] > 0) {
+ $remove = $this->page_url(self::PAGE_SLUG, array_diff_key($this->list_query_args($filters), ['product_id' => true]));
+ $title = (string) get_the_title($filters['product_id']);
+ echo ''
+ . esc_html(sprintf(__('商品：%s', 'aksrt'), $title !== '' ? $title . ' #' . $filters['product_id'] : '#' . $filters['product_id']))
+ . '
';
+ }
+ NativeUi::card_close();
+ }
+
+ /** @param array $options */
+ private function filter_select(string $name, string $label, array $options, string $current): string {
+ $html = '';
+ }
+
+ private function cleanup_form_html(): string {
+ return $this->action_form(
+ 'aksrt_pay_clear_closed_orders',
+ 'aksrt_pay_clear_closed_orders',
+ ['days' => '14'],
+ __('清理 14 天前关闭订单', 'aksrt'),
+ __('将永久删除 14 天前关闭的全部订单，不可恢复。确认清理？', 'aksrt'),
+ true
+ );
+ }
+
+ /** @return array */
+ private function type_options(): array {
+ return [
+ '' => __('全部类型', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_READING => __('付费阅读', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_DOWNLOAD => __('付费下载', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_IMAGE => __('付费图片', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_VIDEO => __('付费视频', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_VIP => __('购买会员', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_RECHARGE => __('余额充值', 'aksrt'),
+ DomainModel::ORDER_PRODUCT_POINTS => __('购买积分', 'aksrt'),
+ ];
+ }
+
+ /** @return array */
+ private function method_options(): array {
+ return [
+ '' => __('支付方式', 'aksrt'),
+ 'balance' => __('余额', 'aksrt'),
+ 'points' => __('积分', 'aksrt'),
+ 'gateway' => __('第三方网关支付', 'aksrt'),
+ ];
+ }
+
+ /**
+ * 从请求读取并校验筛选条件；非法值一律视为未筛选。
+ *
+ * @return array{status:string,s:string,product_type:string,payment_method:string,product_id:int,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) ? $value : '';
+ };
+
+ $status = sanitize_key($read('status'));
+ $type = sanitize_key($read('product_type'));
+ $method = sanitize_key($read('payment_method'));
+
+ return [
+ 'status' => isset($this->status_labels()[$status]) ? $status : '',
+ 's' => $read('s'),
+ 'product_type' => array_key_exists($type, $this->type_options()) ? $type : '',
+ 'payment_method' => array_key_exists($method, $this->method_options()) ? $method : '',
+ 'product_id' => max(0, (int) $read('product_id')),
+ 'user_id' => max(0, (int) $read('user_id')),
+ 'date_from' => $date($read('date_from')),
+ 'date_to' => $date($read('date_to')),
+ ];
+ }
+
+ /**
+ * 当前筛选的 URL 参数（不含 paged）：状态视图、翻页与详情返回链接共用同一份，避免漂移。
+ *
+ * @param array $filters
+ * @return array
+ */
+ private function list_query_args(array $filters): array {
+ return array_filter($filters, static function ($value): bool {
+ return $value !== '' && $value !== 0;
+ });
+ }
+
+ /**
+ * 筛选条件 → 仓储查询参数（不含状态与分页，由调用方按需追加）。
+ *
+ * @param array $filters
+ * @return array
+ */
+ private function list_repository_args(array $filters): array {
+ $args = [
+ 'date_from' => $filters['date_from'],
+ 'date_to' => $filters['date_to'],
+ ];
+ if ($filters['product_type'] !== '') {
+ $args['product_type'] = $filters['product_type'];
+ }
+ if ($filters['product_id'] > 0) {
+ $args['product_id'] = $filters['product_id'];
+ }
+ if ($filters['user_id'] > 0) {
+ $args['user_id'] = $filters['user_id'];
+ }
+ if ($filters['payment_method'] === 'gateway') {
+ $args['payment_methods'] = $this->third_party_gateway_ids();
+ } elseif ($filters['payment_method'] !== '') {
+ $args['payment_methods'] = [$filters['payment_method']];
+ }
+ return $args;
+ }
+
+ /** 一次性预取本页用户与付费内容文章，避免逐行查询。 */
+ private function prime_list_caches(array $items): void {
+ $user_ids = [];
+ $post_ids = [];
+ foreach ($items as $row) {
+ if ((int) ($row['user_id'] ?? 0) > 0) {
+ $user_ids[] = (int) $row['user_id'];
+ }
+ if ((int) ($row['product_id'] ?? 0) > 0 && DomainModel::is_resource_product_type((string) ($row['product_type'] ?? ''))) {
+ $post_ids[] = (int) $row['product_id'];
+ }
+ }
+ if ($user_ids !== []) {
+ cache_users(array_values(array_unique($user_ids)));
+ }
+ if ($post_ids !== []) {
+ _prime_post_caches(array_values(array_unique($post_ids)), false, false);
+ }
+ }
+}
diff --git a/src/Payment/Order.php b/src/Payment/Order.php
index 72e82c45..bfdeaad0 100644
--- a/src/Payment/Order.php
+++ b/src/Payment/Order.php
@@ -32,12 +32,6 @@ class Order {
return \AKSRT\Core\DomainModel::can_transition_order_status($from, $to);
}
- public function init(): void {
- add_action('wp_ajax_aksrt_order_list', [$this, 'ajax_list']);
- add_action('wp_ajax_aksrt_order_update_status', [$this, 'ajax_update_status']);
- add_action('wp_ajax_aksrt_order_stats', [$this, 'ajax_stats']);
- }
-
public function create(int $user_id, string $product_type, int $product_id, string $amount, string $currency = 'CNY'): string {
// Guest content orders may use user_id=0 (legacy pay_no_logged_in).
if ($user_id < 0 || $product_id < 0) {
@@ -78,60 +72,6 @@ class Order {
return $this->repo()->get_valid_vip_order($user_id);
}
- public function ajax_list(): void {
- check_ajax_referer('aksrt_public_nonce', 'nonce');
- if (!current_user_can('manage_options')) {
- wp_send_json_error(['message' => __('权限不足', 'aksrt')]);
- }
-
- $status = sanitize_key((string) ($_GET['status'] ?? ''));
- $search = sanitize_text_field((string) ($_GET['search'] ?? ''));
- $limit = max(1, min(100, (int) ($_GET['limit'] ?? 20)));
- $offset = max(0, (int) ($_GET['offset'] ?? 0));
-
- $orders = $this->repo()->get_orders_admin([
- 'status' => $status,
- 'limit' => $limit,
- 'offset' => $offset,
- ], $search);
-
- wp_send_json_success([
- 'orders' => $orders,
- 'stats' => $this->get_stats(),
- 'total' => $this->repo()->get_orders_count(['status' => $status], $search),
- ]);
- }
-
- public function ajax_update_status(): void {
- check_ajax_referer('aksrt_public_nonce', 'nonce');
- if (!current_user_can('manage_options')) {
- wp_send_json_error(['message' => __('权限不足', 'aksrt')]);
- }
-
- $order_number = sanitize_text_field((string) ($_POST['order_number'] ?? ''));
- $new_status = sanitize_key((string) ($_POST['status'] ?? ''));
- $note = sanitize_textarea_field((string) ($_POST['note'] ?? ''));
-
- if ($order_number === '' || $new_status === '') {
- wp_send_json_error(['message' => __('参数无效', 'aksrt')]);
- }
-
- if ($this->update_status($order_number, $new_status, ['note' => $note])) {
- wp_send_json_success(['message' => __('订单状态已更新', 'aksrt')]);
- }
-
- wp_send_json_error(['message' => __('更新失败', 'aksrt')]);
- }
-
- public function ajax_stats(): void {
- check_ajax_referer('aksrt_public_nonce', 'nonce');
- if (!current_user_can('manage_options')) {
- wp_send_json_error(['message' => __('权限不足', 'aksrt')]);
- }
-
- wp_send_json_success($this->get_stats());
- }
-
private function repo(): OrderRepository {
return OrderRepository::get_instance();
}
diff --git a/src/Payment/OrderRepositoryAdmin.php b/src/Payment/OrderRepositoryAdmin.php
index b0779168..39c5cba7 100644
--- a/src/Payment/OrderRepositoryAdmin.php
+++ b/src/Payment/OrderRepositoryAdmin.php
@@ -62,8 +62,6 @@ trait OrderRepositoryAdmin {
$orders[(string) ($order['order_number'] ?? '')] = $order;
}
- $resolved_order_numbers = array_keys($orders);
-
foreach ($orders as $order_number => $order) {
$contexts[$order_number] = $this->build_admin_order_context($order, []);
}
@@ -73,9 +71,6 @@ trait OrderRepositoryAdmin {
- /**
- * 更新订单状态（带状态机验证）
- */
/**
* Merge operator admin note into order note meta without destroying JSON payload.
*/
@@ -143,21 +138,33 @@ trait OrderRepositoryAdmin {
/**
- * 管理后台订单计数 — 与 get_orders_admin 共用过滤条件
+ * 管理后台按状态计数 — 与 get_orders_admin 共用过滤条件（忽略 status）。
+ * 一次 GROUP BY 同时给出状态视图的各项数字与当前视图的总数。
+ *
+ * @return array 状态键 => 数量（键集合同 order_status_labels()）
*/
- public function get_orders_count(array $args = [], string $search = ''): int {
+ public function get_orders_status_counts(array $args = [], string $search = ''): array {
global $wpdb;
$this->expire_pending_orders();
+ unset($args['status']);
[$where, $params] = $this->build_admin_order_filters($args, $search);
- $where_sql = $where ? 'WHERE ' . implode(' AND ', $where) : '';
- $sql = "SELECT COUNT(*) FROM {$this->table()} {$where_sql}";
+ $sql = "SELECT status, COUNT(*) AS total FROM {$this->table()} WHERE " . implode(' AND ', $where) . ' GROUP BY status';
+ $rows = $wpdb->get_results($wpdb->prepare($sql, $params), ARRAY_A);
- if (!empty($params)) {
- return (int) $wpdb->get_var($wpdb->prepare($sql, $params));
+ $counts = array_fill_keys(array_keys(\AKSRT\Core\DomainModel::order_status_labels()), 0);
+ foreach ((array) $rows as $row) {
+ $status = sanitize_key((string) ($row['status'] ?? ''));
+ // normalize_row 把历史 refunding 展示为已支付，计数口径保持一致。
+ if ($status === 'refunding') {
+ $status = \AKSRT\Core\DomainModel::ORDER_STATUS_PAID;
+ }
+ if (isset($counts[$status])) {
+ $counts[$status] += (int) ($row['total'] ?? 0);
+ }
}
- return (int) $wpdb->get_var($sql);
+ return $counts;
}
diff --git a/tests/admin/pay-pages-pagination.test.cjs b/tests/admin/pay-pages-pagination.test.cjs
index 6293d820..b30ac721 100644
--- a/tests/admin/pay-pages-pagination.test.cjs
+++ b/tests/admin/pay-pages-pagination.test.cjs
@@ -39,7 +39,7 @@ const chargeCards = [
'src/Admin/Native/PayChargeCardsForms.php',
].map(read).join('\n');
const pages = {
- orders: read('src/Admin/Native/PayOrders.php'),
+ orders: ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n'),
products: read('src/Admin/Native/PayProducts.php'),
coupons: read('src/Admin/Native/PayCoupons.php'),
income: read('src/Admin/Native/PayIncome.php'),
@@ -127,8 +127,15 @@ test('每页都在查询前夹取页码，越界时重查一次', () => {
'卡密管理缺少越界回退'
);
+ // 订单明细先用状态计数得出总数、夹取页码，再只查一次列表——不需要越界重查。
+ assert.equal(count(pages.orders, /\$items\s*=\s*\$repo->get_orders_admin\(/g), 1, '订单明细只应查询一次列表');
+ assert.ok(
+ pages.orders.indexOf('get_orders_status_counts(') < pages.orders.indexOf('if ($page_num > $pages) {')
+ && pages.orders.indexOf('if ($page_num > $pages) {') < pages.orders.indexOf('$repo->get_orders_admin('),
+ '订单明细必须在查询列表前完成计数与页码夹取'
+ );
+
const requeries = {
- orders: [/\$items\s*=\s*\$repo->get_orders_admin\(/g],
products: [/\$query\s*=\s*\$this->query_paid_posts\(/g],
coupons: [/\$svc->get_list\(/g],
income: [/\$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 3892dabf..d245b226 100644
--- a/tests/widget-system/financial-flow-contract.test.cjs
+++ b/tests/widget-system/financial-flow-contract.test.cjs
@@ -53,7 +53,7 @@ test('commission ledger and withdrawals retain their flow while order flows are
test('orders have no independent flow page or visible flow number', () => {
const menu = read('src/Admin/Native/PayMenus.php')
- const payOrders = read('src/Admin/Native/PayOrders.php')
+ const payOrders = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
assert.doesNotMatch(menu, /PayFlows|流水明细/)
assert.equal(fs.existsSync(path.join(root, 'src/Admin/Native/PayFlows.php')), false)
assert.equal(fs.existsSync(path.join(root, 'src/Finance/FinancialFlowQuery.php')), false)
@@ -125,7 +125,7 @@ test('flow retention and archive were deliberately removed', () => {
assert.equal(fs.existsSync(path.join(root, 'src/Finance/FinancialFlowRetention.php')), false)
})
test('order detail page drops tabs; ticket center replaces the after-sale submenu', () => {
- const page = read('src/Admin/Native/PayOrders.php')
+ const page = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
const menus = read('src/Admin/Native/PayMenus.php')
const repository = read('src/Payment/OrderRepositoryCore.php')
// 订单明细页不再有 Tab 分页：统计 Tab 与页面整体删除
@@ -152,10 +152,10 @@ test('order detail page drops tabs; ticket center replaces the after-sale submen
})
test('paid orders expose a refund button next to the detail link', () => {
- const page = read('src/Admin/Native/PayOrders.php')
- // 「退款」紧跟在「详情」右侧，仅已支付订单可见——已退款是已支付的唯一后继状态
- assert.match(page, /详情', 'aksrt'\) \. '<\/a>';\s*\n\s*\/\/ 已支付是已退款的唯一前置状态[\s\S]*?aksrt_pay_refund_order/)
- assert.ok(page.includes("if ($status_key === \\AKSRT\\Core\\DomainModel::ORDER_STATUS_PAID) {"),
+ const page = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
+ // 「标记退款」紧跟在「详情」右侧（行操作区由 order_actions_html 输出），仅已支付订单可见——已退款是已支付的唯一后继状态
+ assert.match(page, /详情', 'aksrt'\) \. '<\/a>'\s*\n\s*\. \$this->order_actions_html\(\$order_number, \$status\)/)
+ assert.match(page, /\/\/ 已支付是已退款的唯一前置状态。\s*\n\s*if \(\$status === DomainModel::ORDER_STATUS_PAID\) \{[\s\S]*?'aksrt_pay_refund_order'/,
'refund button only renders for paid orders')
assert.ok(page.includes('aksrt_pay_refund_order_'), 'per-order nonce covers the refund')
assert.ok(page.includes("add_action('admin_post_aksrt_pay_refund_order', [$this, 'handle_refund_order'])"),
@@ -202,7 +202,7 @@ test('caller-supplied order numbers are constrained to allocator shapes', () =>
test('order cleanup no longer guards on financial records', () => {
const repository = read('src/Payment/OrderRepositoryCore.php')
- const payOrders = read('src/Admin/Native/PayOrders.php')
+ const payOrders = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
assert.match(repository, /public function clear_closed_orders\(int \$days = 14\): int/)
assert.match(repository, /public function delete_order\(string \$order_number\): bool/)
for (const source of [repository, payOrders]) {
diff --git a/tests/widget-system/pay-orders-filter-contract.test.cjs b/tests/widget-system/pay-orders-filter-contract.test.cjs
index 993f524a..c1b0189d 100644
--- a/tests/widget-system/pay-orders-filter-contract.test.cjs
+++ b/tests/widget-system/pay-orders-filter-contract.test.cjs
@@ -7,7 +7,7 @@ const root = path.resolve(__dirname, '..', '..')
const read = (relativePath) => fs.readFileSync(path.join(root, relativePath), 'utf8')
test('admin order filters expose only the current order and payment categories', () => {
- const page = read('src/Admin/Native/PayOrders.php')
+ const page = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
for (const [type, label] of [
['READING', '付费阅读'], ['DOWNLOAD', '付费下载'], ['IMAGE', '付费图片'], ['VIDEO', '付费视频'],
@@ -24,7 +24,7 @@ test('admin order filters expose only the current order and payment categories',
})
test('third-party payment filter resolves registered external gateways as one query', () => {
- const page = read('src/Admin/Native/PayOrders.php')
+ const page = ['PayOrders', 'PayOrdersList', 'PayOrdersDetail'].map((f) => read(`src/Admin/Native/${f}.php`)).join('\n')
const repository = read('src/Payment/OrderRepositoryAdmin.php')
assert.match(page, /\$args\['payment_methods'\]\s*=\s*\$this->third_party_gateway_ids\(\)/)