';
- echo '| ' . esc_html__('提现单号', 'aksrt') . ' | ';
+ echo '' . esc_html__('流水号', 'aksrt') . ' | ';
echo '' . esc_html__('用户', 'aksrt') . ' | ';
echo '' . esc_html__('金额明细', 'aksrt') . ' | ';
echo '' . esc_html__('渠道 / 账户', 'aksrt') . ' | ';
diff --git a/src/Admin/Schema/SchemaPayment.php b/src/Admin/Schema/SchemaPayment.php
index a611d612..1b71e9b9 100644
--- a/src/Admin/Schema/SchemaPayment.php
+++ b/src/Admin/Schema/SchemaPayment.php
@@ -12,8 +12,8 @@ defined('ABSPATH') || exit;
*
* 页面结构 1:1 复刻参考主题 Zibll 的「支付&付费」section（知识付费 / 余额充值 /
* VIP会员 / 创作分成 / 推广返佣 / 收款接口），并按产品需求新增「提现策略」子页。
- * 收款接口仅保留支付宝、微信、PayPal、Stripe、易支付；订单前缀 / 流水号前缀 /
- * 提现单号前缀配置保留并收口在收款接口页。
+ * 收款接口仅保留支付宝、微信、PayPal、Stripe、易支付；订单、资金流水与提现
+ * 统一使用同一套流水号，无可配置前缀。
*/
class SchemaPayment {
@@ -61,7 +61,7 @@ class SchemaPayment {
['key' => 'pay_mark', 'label' => '付费标记', 'type' => 'input', 'default' => '付费'],
['key' => 'payment_show_ip', 'label' => '显示用户IP', 'type' => 'switch', 'default' => false],
['key' => 'payment_show_device', 'label' => '显示设备信息', 'type' => 'switch', 'default' => false],
- ['key' => 'payment_show_order_no', 'label' => '显示订单号', 'type' => 'switch', 'default' => true],
+ ['key' => 'payment_show_order_no', 'label' => '显示流水号', 'type' => 'switch', 'default' => true],
['key' => 'payment_show_create_time', 'label' => '显示创建时间', 'type' => 'switch', 'default' => true],
['key' => 'payment_show_pay_time', 'label' => '显示支付时间', 'type' => 'switch', 'default' => true],
]],
@@ -406,9 +406,6 @@ class SchemaPayment {
['key' => 'pay_sdk_custom_title', 'label' => '自定义收款标题', 'type' => 'input', 'default' => '', 'dependsOn' => ['key' => 'pay_sdk_custom_title_s', 'value' => true], 'help' => '可使用变量：订单类型 %order_type%，例如：%order_type%-AKSRT；注意控制总长度，太长会导致部分接口报错'],
]],
['key' => 'order', 'title' => '订单与编号', 'fields' => [
- ['key' => 'payment_order_prefix', 'label' => '订单前缀', 'type' => 'input', 'default' => 'AKSRT', 'help' => '订单号生成前缀'],
- ['key' => 'payment_flow_prefix', 'label' => '流水号前缀', 'type' => 'input', 'sanitize_type' => 'business_prefix', 'default' => 'AK', 'maxlength' => 12, 'help' => '仅允许字母、数字、下划线和短横线，最多 12 位。'],
- ['key' => 'payment_withdrawal_prefix', 'label' => '提现单号前缀', 'type' => 'input', 'sanitize_type' => 'business_prefix', 'default' => 'TX', 'maxlength' => 12, 'help' => '仅允许字母、数字、下划线和短横线，最多 12 位。'],
['key' => 'payment_order_expiry', 'label' => '订单支付时效(分钟)', 'type' => 'number', 'default' => 30, 'min' => 5, 'max' => 1440, 'help' => '用户下单后，最大支付时间，超过后订单将自动关闭(不能低于5分钟)'],
['key' => 'pay_wait_float_s', 'label' => '浮窗显示待支付订单', 'type' => 'switch', 'default' => true, 'help' => '将用户待支付订单一直显示在右上角，提醒用户付款'],
]],
diff --git a/src/Admin/SchemaProvider.php b/src/Admin/SchemaProvider.php
index 01469823..f69ecb3e 100644
--- a/src/Admin/SchemaProvider.php
+++ b/src/Admin/SchemaProvider.php
@@ -892,9 +892,6 @@ class SchemaProvider {
}
$type = (string) ($field['type'] ?? 'text');
$sanitize_type = (string) ($field['sanitize_type'] ?? '');
- if ($sanitize_type === 'business_prefix') {
- return \AKSRT\Finance\BusinessNumber::normalize_prefix($value, (string) ($field['default'] ?? 'AK'));
- }
if ($sanitize_type !== '') {
return $this->sanitize_value($value, $sanitize_type);
}
diff --git a/src/Finance/BusinessNumber.php b/src/Finance/BusinessNumber.php
index 5d6fda3a..13ac812e 100644
--- a/src/Finance/BusinessNumber.php
+++ b/src/Finance/BusinessNumber.php
@@ -7,30 +7,28 @@ namespace AKSRT\Finance;
defined('ABSPATH') || exit;
+/**
+ * 统一业务流水号分配器。
+ *
+ * 订单号、资金流水号、提现单号共用同一套号码规则，不再按业务类型区分，
+ * 也不再存在任何可配置前缀：{YmdHis}{6 位随机数}，共 20 字符。
+ * 该长度同时满足数据库 VARCHAR(32) 列与各网关 out_trade_no ≤32 字符的限制。
+ */
final class BusinessNumber {
- public const MAX_PREFIX_LENGTH = 12;
-
- public static function normalize_prefix(mixed $value, string $fallback): string {
- $prefix = strtoupper(trim(sanitize_text_field(is_scalar($value) ? (string) $value : '')));
- $prefix = (string) preg_replace('/[^A-Z0-9_-]/', '', $prefix);
- $prefix = substr($prefix, 0, self::MAX_PREFIX_LENGTH);
- if ($prefix !== '') {
- return $prefix;
- }
-
- $fallback = strtoupper((string) preg_replace('/[^A-Z0-9_-]/', '', $fallback));
- return substr($fallback !== '' ? $fallback : 'AK', 0, self::MAX_PREFIX_LENGTH);
- }
-
- public static function candidate(string $prefix, ?\DateTimeInterface $now = null, ?int $random = null): string {
- $prefix = self::normalize_prefix($prefix, 'AK');
+ /**
+ * 生成一个统一流水号。
+ *
+ * @param \DateTimeInterface|null $now 分配时刻，默认取站内时区的当前时间。
+ * @param int|null $random 0-999999 的随机后缀，默认随机取值。
+ */
+ public static function allocate(?\DateTimeInterface $now = null, ?int $random = null): string {
if ($now === null) {
$now = new \DateTimeImmutable('now', wp_timezone());
}
$random = $random ?? random_int(0, 999999);
$random = max(0, min(999999, $random));
- return $prefix . $now->format('YmdHis') . str_pad((string) $random, 6, '0', STR_PAD_LEFT);
+ return $now->format('YmdHis') . str_pad((string) $random, 6, '0', STR_PAD_LEFT);
}
}
diff --git a/src/Finance/FinancialFlowService.php b/src/Finance/FinancialFlowService.php
index 35ba8cec..66cda609 100644
--- a/src/Finance/FinancialFlowService.php
+++ b/src/Finance/FinancialFlowService.php
@@ -104,7 +104,7 @@ final class FinancialFlowService {
*
* 卡密是平台自发的预付凭证：核销那一刻既没有第三方现金流入，也不产生账本资产分录，
* 订单金额还可能为 0（会员卡）或以积分计价（积分卡）。因此这里只落一条与订单关联的
- * order_payment 流水，不生成任何现金/资产分录，让订单在详情页具备可追溯的「支付流水号」。
+ * order_payment 流水，不生成任何现金/资产分录，让订单在详情页具备可追溯的「账本流水号」。
*
* 余额卡与积分卡的核销走账本（LedgerService::credit），其流水由 record_ledger() 落库；
* 本方法供会员卡这类无账本参与的卡种调用。
@@ -122,7 +122,7 @@ final class FinancialFlowService {
* 卡密核销的资产入账走账本，但订单号是随机生成的、不能进 LedgerCommand
* （payload_hash 覆盖 metadata，塞入随机号会破坏账本幂等重放）。因此账本
* 提交之后再调用本方法补挂关联；同时把 event_type 归一为 order_payment，
- * 让订单详情页的「支付流水号」能反查到它。
+ * 让订单详情页的「账本流水号」能反查到它。
*
* @return bool 是否发生了更新
*/
@@ -218,12 +218,10 @@ final class FinancialFlowService {
return new \WP_Error('aksrt_flow_db', __('无法开启资金流水事务', 'aksrt'), ['status' => 500]);
}
- $settings = \AKSRT\Settings\Settings::get_order_settings();
- $prefix = BusinessNumber::normalize_prefix($settings['flow_prefix'] ?? 'AK', 'AK');
$flow_id = 0;
$flow_number = '';
for ($attempt = 1; $attempt <= self::MAX_NUMBER_ATTEMPTS; $attempt++) {
- $flow_number = BusinessNumber::candidate($prefix);
+ $flow_number = BusinessNumber::allocate();
$metadata = is_array($flow['metadata'] ?? null) ? $flow['metadata'] : [];
$inserted = $wpdb->insert($this->flow_table(), [
'flow_number' => $flow_number,
diff --git a/src/Payment/ChargeCard.php b/src/Payment/ChargeCard.php
index 18c6842c..78b89b0d 100644
--- a/src/Payment/ChargeCard.php
+++ b/src/Payment/ChargeCard.php
@@ -726,8 +726,8 @@ class ChargeCard {
}
/**
- * 卡密核销订单号：走统一的订单号分配器，受后台「订单前缀」控制
- * （Settings::get_order_settings()['prefix']，默认 AKSRT）。
+ * 卡密核销订单号：走统一的流水号分配器，不再使用任何可配置前缀
+ * （见 {@see \AKSRT\Finance\BusinessNumber::allocate()}）。
*
* @return string|\WP_Error
*/
@@ -743,16 +743,11 @@ class ChargeCard {
}
/**
- * 卡密核销订单的渠道交易号：与资金流水同源，受后台「流水号前缀」控制
- * （Settings::get_order_settings()['flow_prefix']，默认 AK）。
+ * 卡密核销订单的渠道交易号：与资金流水号同源，统一走流水号分配器，
+ * 不再消费任何后台前缀配置。
*/
private function card_pass_transaction_number(): string {
- $prefix = 'AK';
- if (class_exists('\AKSRT\Settings\Settings') && method_exists('\AKSRT\Settings\Settings', 'get_order_settings')) {
- $settings = \AKSRT\Settings\Settings::get_order_settings();
- $prefix = \AKSRT\Finance\BusinessNumber::normalize_prefix($settings['flow_prefix'] ?? 'AK', 'AK');
- }
- return \AKSRT\Finance\BusinessNumber::candidate($prefix);
+ return \AKSRT\Finance\BusinessNumber::allocate();
}
/**
diff --git a/src/Payment/OrderRepositoryCore.php b/src/Payment/OrderRepositoryCore.php
index 9cc08cd8..c44815f3 100644
--- a/src/Payment/OrderRepositoryCore.php
+++ b/src/Payment/OrderRepositoryCore.php
@@ -27,7 +27,7 @@ trait OrderRepositoryCore {
public function create(array $data): string {
global $wpdb;
- $order_number = $data['order_number'] ?? $this->generate_order_number();
+ $order_number = $data['order_number'] ?? $this->allocate_order_number();
// Preserve JSON pay meta (VIP/content/coupon). Only strip tags for plain text notes.
$note_raw = (string) ($data['note'] ?? '');
@@ -811,39 +811,13 @@ trait OrderRepositoryCore {
/**
- * Build a unique order number using the admin-configured prefix.
+ * 分配订单号。
*
- * Column + major gateways (WeChat out_trade_no) cap at 32 chars, so the
- * prefix is trimmed to leave room for {YmdHis}{4 digits} (=18).
+ * 订单号不再是独立编号体系：与资金流水号、提现单号共用统一流水号规则，
+ * 由 {@see \AKSRT\Finance\BusinessNumber::allocate()} 生成，不带任何前缀。
*/
public function allocate_order_number(): string {
- return $this->generate_order_number();
- }
-
- private function generate_order_number(): string {
- $prefix = 'AKSRT';
- if (class_exists('\AKSRT\Settings\Settings') && method_exists('\AKSRT\Settings\Settings', 'get_order_settings')) {
- $settings = \AKSRT\Settings\Settings::get_order_settings();
- $configured = sanitize_text_field((string) ($settings['prefix'] ?? ''));
- if ($configured !== '') {
- $prefix = $configured;
- }
- }
-
- // Keep only gateway-safe chars (REST + WeChat/Alipay out_trade_no).
- $prefix = preg_replace('/[^A-Za-z0-9_-]/', '', $prefix);
- if (!is_string($prefix) || $prefix === '') {
- $prefix = 'AKSRT';
- }
-
- $body = date('YmdHis') . str_pad((string) random_int(0, 9999), 4, '0', STR_PAD_LEFT);
- // Reserve 18 for body; leave ≥1 char of prefix so numbers stay human-readable.
- $max_prefix = max(1, 32 - strlen($body));
- if (strlen($prefix) > $max_prefix) {
- $prefix = substr($prefix, 0, $max_prefix);
- }
-
- return $prefix . $body;
+ return \AKSRT\Finance\BusinessNumber::allocate();
}
/**
diff --git a/src/Payment/PaymentOrchestrator.php b/src/Payment/PaymentOrchestrator.php
index fdde7276..a6b6690a 100644
--- a/src/Payment/PaymentOrchestrator.php
+++ b/src/Payment/PaymentOrchestrator.php
@@ -39,7 +39,7 @@ class PaymentOrchestrator {
public static function pay(GatewayInterface $gateway, array $order, array $opts = []): array {
$order_number = sanitize_text_field((string) ($order['order_number'] ?? ''));
if ($order_number === '' || !class_exists('AKSRT\\Payment\\OrderRepository')) {
- return self::fail('aksrt_pay_failed', __('订单号无效。', 'aksrt'));
+ return self::fail('aksrt_pay_failed', __('流水号无效。', 'aksrt'));
}
$method = sanitize_key((string) ($order['payment_method'] ?? ''));
diff --git a/src/Payment/UserOrders.php b/src/Payment/UserOrders.php
index 7a750bf0..25e705b8 100644
--- a/src/Payment/UserOrders.php
+++ b/src/Payment/UserOrders.php
@@ -232,9 +232,8 @@ class UserOrders {
])),
];
if ($detail) {
- $view['flow_number'] = $order_number !== '' && $group !== OrderCenterQuery::STATUS_PENDING
- ? \AKSRT\Finance\FinancialFlowQuery::get_instance()->order_payment_number($order_number)
- : '';
+ // 前台订单详情只暴露统一流水号（order_number）；账本流水号为后台口径，
+ // 不下发到前台，避免同一单据出现两个对外号码。
$view['paid_at'] = (string) ($order['paid_at'] ?? '');
$view['expires_at'] = (string) ($order['expires_at'] ?? '');
$view['reconciliation'] = $reconciliation ?: ['state' => 'not_needed', 'required' => false];
diff --git a/src/Payment/Withdrawal.php b/src/Payment/Withdrawal.php
index 2223735d..cbe7963a 100644
--- a/src/Payment/Withdrawal.php
+++ b/src/Payment/Withdrawal.php
@@ -147,11 +147,9 @@ class Withdrawal {
'source' => 'balance',
'operation_key' => $operation_key,
], JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) ?: $account;
- $order_settings = \AKSRT\Settings\Settings::get_order_settings();
- $prefix = \AKSRT\Finance\BusinessNumber::normalize_prefix($order_settings['withdrawal_prefix'] ?? 'TX', 'TX');
$ok = false;
for ($attempt = 1; $attempt <= 5; $attempt++) {
- $withdrawal_number = \AKSRT\Finance\BusinessNumber::candidate($prefix);
+ $withdrawal_number = \AKSRT\Finance\BusinessNumber::allocate();
$ok = $wpdb->insert($this->table(), [
'withdrawal_number' => $withdrawal_number,
'user_id' => $user_id,
diff --git a/src/Settings/CreditsPaymentGroups.php b/src/Settings/CreditsPaymentGroups.php
index 369247d2..c71e46d0 100644
--- a/src/Settings/CreditsPaymentGroups.php
+++ b/src/Settings/CreditsPaymentGroups.php
@@ -169,7 +169,7 @@ trait CreditsPaymentGroups {
/**
* 获取订单设置
*
- * @return array{prefix:string,flow_prefix:string,withdrawal_prefix:string,expiry:int,show_user:bool,show_paycount:bool,no_logged_in:bool,cookie_day:int,no_logged_remind:bool,wait_float:bool,mark:string,box_position:string,show_ip:bool,show_device:bool,show_order_no:bool,show_create_time:bool,show_pay_time:bool,status_texts:array,service:array}
+ * @return array{expiry:int,show_user:bool,show_paycount:bool,no_logged_in:bool,cookie_day:int,no_logged_remind:bool,wait_float:bool,mark:string,box_position:string,show_ip:bool,show_device:bool,show_order_no:bool,show_create_time:bool,show_pay_time:bool,status_texts:array,service:array}
*/
public static function get_order_settings(): array {
return PaymentRuntime::get_order_settings();
diff --git a/src/Settings/MailTemplates.php b/src/Settings/MailTemplates.php
index 8de7f699..a87d4f24 100644
--- a/src/Settings/MailTemplates.php
+++ b/src/Settings/MailTemplates.php
@@ -14,8 +14,8 @@ final class MailTemplates {
public static function definitions(): array {
return [
'links_submit_admin' => self::event('友情链接提交通知', '新友情链接提交：{title}\n提交人：{username}\n链接：{url}\n请登录后台审核。', ['title', 'username', 'url']),
- 'order_paid_admin' => self::event('新订单通知（管理员）', '收到一笔新订单。\n订单号：{order_number}\n用户：{username}\n商品：{product}\n金额：{amount} {currency}\n支付方式：{payment_method}', ['order_number', 'username', 'product', 'amount', 'currency', 'payment_method']),
- 'withdraw_submitted_admin' => self::event('提现申请通知（管理员）', '用户 {username} 提交了提现申请。\n提现单号：{withdrawal_number}\n金额：{amount}\n方式：{method}', ['username', 'withdrawal_number', 'amount', 'method']),
+ 'order_paid_admin' => self::event('新订单通知（管理员）', '收到一笔新订单。\n流水号：{order_number}\n用户：{username}\n商品：{product}\n金额：{amount} {currency}\n支付方式：{payment_method}', ['order_number', 'username', 'product', 'amount', 'currency', 'payment_method']),
+ 'withdraw_submitted_admin' => self::event('提现申请通知（管理员）', '用户 {username} 提交了提现申请。\n流水号：{withdrawal_number}\n金额：{amount}\n方式：{method}', ['username', 'withdrawal_number', 'amount', 'method']),
'post_pending_admin' => self::event('投稿待审核通知', '用户 {username} 提交了待审核内容：{title}\n查看地址：{url}', ['username', 'title', 'url']),
'auth_apply_admin' => self::event('身份认证申请通知', '用户 {username} 提交了身份认证申请，请登录后台审核。\n查看地址：{url}', ['username', 'url']),
'ban_appeal_admin' => self::event('账号申诉通知', '用户 {username} 提交了账号申诉。\n查看地址：{url}', ['username', 'url']),
@@ -27,9 +27,9 @@ final class MailTemplates {
'password_reset' => self::event('密码重置验证码', '您好 {username}，\n\n您正在重置 {site_name} 的账号密码，验证码为：\n\n【{code}】\n\n验证码 10 分钟内有效。如非本人操作，请忽略此邮件。', ['username', 'site_name', 'code']),
'change_code' => self::event('敏感操作验证码', '您好 {username}，\n\n您正在进行敏感操作，验证码为：\n\n【{code}】\n\n验证码 5 分钟内有效。如非本人操作，请忽略此邮件。', ['username', 'site_name', 'code']),
'change_notice' => self::event('账号邮箱已变更', '您好 {username}，\n\n您的账号邮箱已成功修改为：{new_email}\n\n如果这不是您的操作，请立即联系站点管理员。', ['username', 'site_name', 'new_email']),
- 'order_paid' => self::event('订单支付成功', '您好 {username}，\n\n您的订单已支付成功。\n订单号：{order_number}\n商品：{product}\n金额：{amount} {currency}\n\n查看订单：{url}', ['username', 'order_number', 'product', 'amount', 'currency', 'url']),
+ 'order_paid' => self::event('订单支付成功', '您好 {username}，\n\n您的订单已支付成功。\n流水号：{order_number}\n商品：{product}\n金额：{amount} {currency}\n\n查看订单：{url}', ['username', 'order_number', 'product', 'amount', 'currency', 'url']),
'order_status' => self::event('订单状态更新', '您好 {username}，\n\n您的订单 {order_number} 状态已更新为：{status}。\n商品：{product}\n查看详情：{url}', ['username', 'order_number', 'status', 'product', 'url']),
- 'withdraw_submitted' => self::event('提现申请已提交', '您好 {username}，\n\n您的提现申请已提交。\n提现单号：{withdrawal_number}\n金额：{amount}\n方式：{method}', ['username', 'withdrawal_number', 'amount', 'method']),
+ 'withdraw_submitted' => self::event('提现申请已提交', '您好 {username}，\n\n您的提现申请已提交。\n流水号：{withdrawal_number}\n金额：{amount}\n方式：{method}', ['username', 'withdrawal_number', 'amount', 'method']),
'withdraw_completed' => self::event('提现状态更新', '您好 {username}，\n\n您的提现申请 {withdrawal_number} 当前状态为：{status}。\n金额：{amount}\n{note}', ['username', 'withdrawal_number', 'status', 'amount', 'note']),
'affiliate_commission' => self::event('返佣到账通知', '您好 {username}，\n\n您的推广返佣已到账。\n金额：{amount}\n来源订单：{order_number}\n查看收益：{url}', ['username', 'amount', 'order_number', 'url']),
'creator_income' => self::event('创作分成到账通知', '您好 {username}，\n\n您的创作分成已到账。\n金额：{amount}\n来源订单：{order_number}\n查看收益：{url}', ['username', 'amount', 'order_number', 'url']),
diff --git a/src/Settings/PaymentRuntime.php b/src/Settings/PaymentRuntime.php
index 55f536b8..de4d1024 100644
--- a/src/Settings/PaymentRuntime.php
+++ b/src/Settings/PaymentRuntime.php
@@ -454,9 +454,6 @@ class PaymentRuntime {
}
return [
- 'prefix' => sanitize_text_field((string) ($s['payment_order_prefix'] ?? 'AKSRT')),
- 'flow_prefix' => \AKSRT\Finance\BusinessNumber::normalize_prefix($s['payment_flow_prefix'] ?? 'AK', 'AK'),
- 'withdrawal_prefix' => \AKSRT\Finance\BusinessNumber::normalize_prefix($s['payment_withdrawal_prefix'] ?? 'TX', 'TX'),
'expiry' => $expiry,
'show_user' => !isset($s['pay_show_user']) || !empty($s['pay_show_user']),
'show_paycount' => !isset($s['pay_show_paycount']) || !empty($s['pay_show_paycount']),
diff --git a/templates/parts/resource-download-box.php b/templates/parts/resource-download-box.php
index 87f2a85e..c69ab822 100644
--- a/templates/parts/resource-download-box.php
+++ b/templates/parts/resource-download-box.php
@@ -221,7 +221,7 @@ if ($is_need_purchase && $user_amount > 0) {
-
+
diff --git a/tests/admin/card-pass-order-numbers.test.cjs b/tests/admin/card-pass-order-numbers.test.cjs
index 1bb8db7e..3f3b7d8d 100644
--- a/tests/admin/card-pass-order-numbers.test.cjs
+++ b/tests/admin/card-pass-order-numbers.test.cjs
@@ -5,13 +5,14 @@
*
* 背景（已修复的缺陷）：
* 卡密充值（balance/credits）与兑换（vip）虽已建订单，但订单号硬编码为
- * `CARD{卡ID}`、渠道交易号硬编码为 `card_pass_{卡ID}`，均不受后台
- * 「订单前缀 / 流水号前缀」控制；且卡密核销产生的资金流水没有挂到订单上
- * （order_number 为 NULL），订单详情页的「支付流水号」永远显示「—」。
+ * `CARD{卡ID}`、渠道交易号硬编码为 `card_pass_{卡ID}`；且卡密核销产生的资金流水
+ * 没有挂到订单上（order_number 为 NULL），订单详情页的「账本流水号」永远显示「—」。
*
* 处置：
- * - 订单号走 OrderRepository::allocate_order_number()（消费 payment_order_prefix）；
- * - 渠道交易号走 BusinessNumber::candidate(flow_prefix)（消费 payment_flow_prefix）；
+ * - 订单号走 OrderRepository::allocate_order_number()；
+ * - 渠道交易号走 BusinessNumber::allocate()；
+ * - 两者与资金流水号、提现单号同源，均为无前缀的统一流水号，
+ * 后台不再提供任何前缀配置项；
* - 余额/积分卡的流水由账本落库后用 attach_order_to_ledger_flow() 补挂订单号，
* 并把 event_type 归一为 order_payment；会员卡（0 元、无账本参与）由
* record_card_pass_payment() 直接落一条零分录的 order_payment 流水。
@@ -47,11 +48,12 @@ test('卡密订单号不再硬编码 CARD 前缀，改走统一分配器', () =>
}
});
-test('渠道交易号不再硬编码 card_pass_ 前缀，改走流水号前缀', () => {
+test('渠道交易号不再硬编码 card_pass_ 前缀，改走统一流水号分配器', () => {
assert.doesNotMatch(card, /'card_pass_'\s*\.\s*\$card_id/);
assert.match(card, /card_pass_transaction_number\(\)/);
- assert.match(card, /BusinessNumber::normalize_prefix\(\$settings\['flow_prefix'\]/);
- assert.match(card, /BusinessNumber::candidate\(\$prefix\)/);
+ // 不再读取任何前缀配置，直接取统一流水号
+ assert.doesNotMatch(card, /normalize_prefix|flow_prefix|get_order_settings/);
+ assert.match(card, /private function card_pass_transaction_number\(\): string \{\s*return \\AKSRT\\Finance\\BusinessNumber::allocate\(\);/);
// create_redeem_order 只接收调用方传入的交易号，不再自行拼前缀
assert.match(card, /'payment_transaction_id'\s*=>\s*\$order_status === Order::STATUS_PAID \? \$transaction_number : ''/);
});
diff --git a/tests/asset-ledger/BusinessNumberTest.php b/tests/asset-ledger/BusinessNumberTest.php
index f67ada85..d972ef78 100644
--- a/tests/asset-ledger/BusinessNumberTest.php
+++ b/tests/asset-ledger/BusinessNumberTest.php
@@ -4,16 +4,24 @@ use AKSRT\Finance\BusinessNumber;
use PHPUnit\Framework\TestCase;
final class BusinessNumberTest extends TestCase {
- public function test_prefix_is_uppercased_filtered_and_limited(): void {
- self::assertSame('AK', BusinessNumber::normalize_prefix('', 'AK'));
- self::assertSame('TX_TEST-9', BusinessNumber::normalize_prefix(' tx_测test-9 ', 'TX'));
- self::assertSame('ABCDEFGHIJKL', BusinessNumber::normalize_prefix('abcdefghijklmnop', 'AK'));
- self::assertSame('TX', BusinessNumber::normalize_prefix('中文', 'TX'));
+ public function test_allocate_uses_site_time_and_six_digit_random_suffix(): void {
+ $time = new DateTimeImmutable('2026-08-25 13:14:15', new DateTimeZone('Asia/Shanghai'));
+ self::assertSame('20260825131415000007', BusinessNumber::allocate($time, 7));
+ self::assertSame('20260825131415999999', BusinessNumber::allocate($time, 999999));
}
- public function test_candidate_uses_supplied_site_time_and_six_digit_random_suffix(): void {
+ public function test_allocate_is_prefix_free_and_within_gateway_limit(): void {
$time = new DateTimeImmutable('2026-08-25 13:14:15', new DateTimeZone('Asia/Shanghai'));
- self::assertSame('AK20260825131415000007', BusinessNumber::candidate('ak', $time, 7));
- self::assertMatchesRegularExpression('/^TX\d{14}\d{6}$/', BusinessNumber::candidate('TX', $time, 999999));
+ $number = BusinessNumber::allocate($time, 0);
+ self::assertSame('20260825131415000000', $number);
+ // 订单号 / 流水号 / 提现单号共用同一长度，须同时满足 VARCHAR(32) 与网关 out_trade_no ≤32。
+ self::assertSame(20, strlen($number));
+ self::assertLessThanOrEqual(32, strlen($number));
+ }
+
+ public function test_allocate_clamps_out_of_range_random_suffix(): void {
+ $time = new DateTimeImmutable('2026-01-01 00:00:00', new DateTimeZone('Asia/Shanghai'));
+ self::assertSame('20260101000000999999', BusinessNumber::allocate($time, 1000000));
+ self::assertSame('20260101000000000000', BusinessNumber::allocate($time, -5));
}
}
diff --git a/tests/widget-system/financial-flow-contract.test.cjs b/tests/widget-system/financial-flow-contract.test.cjs
index d21b1ecf..b129dcb3 100644
--- a/tests/widget-system/financial-flow-contract.test.cjs
+++ b/tests/widget-system/financial-flow-contract.test.cjs
@@ -14,12 +14,32 @@ test('financial flow and withdrawal numbers use the new-only schema', () => {
assert.match(schema, /CREATE TABLE \{\$prefix\}aksrt_withdrawal \([\s\S]*?withdrawal_number VARCHAR\(32\) NOT NULL[\s\S]*?UNIQUE KEY uniq_withdrawal_number \(withdrawal_number\)/)
})
-test('order settings expose strict flow and withdrawal prefixes', () => {
- const schema = read('assets/admin/src/schema/sections/payment/gateway.js')
+test('order, flow and withdrawal numbers share one prefix-free allocator', () => {
+ const jsSchema = read('assets/admin/src/schema/sections/payment/gateway.js')
+ const phpSchema = read('src/Admin/Schema/SchemaPayment.php')
const provider = read('src/Admin/SchemaProvider.php')
- assert.match(schema, /key:\s*'payment_flow_prefix'[^{\n]*sanitize_type:\s*'business_prefix'[^{\n]*default:\s*'AK'/)
- assert.match(schema, /key:\s*'payment_withdrawal_prefix'[^{\n]*sanitize_type:\s*'business_prefix'[^{\n]*default:\s*'TX'/)
- assert.match(provider, /business_prefix[\s\S]*?BusinessNumber::normalize_prefix/)
+ const runtime = read('src/Settings/PaymentRuntime.php')
+ const number = read('src/Finance/BusinessNumber.php')
+
+ // 三个前缀配置项及其校验/归一化链路必须彻底消失。
+ for (const source of [jsSchema, phpSchema]) {
+ assert.doesNotMatch(source, /payment_order_prefix|payment_flow_prefix|payment_withdrawal_prefix/)
+ assert.doesNotMatch(source, /business_prefix/)
+ }
+ assert.doesNotMatch(provider, /business_prefix|normalize_prefix/)
+ assert.doesNotMatch(runtime, /payment_order_prefix|payment_flow_prefix|payment_withdrawal_prefix/)
+ assert.doesNotMatch(runtime, /['"](prefix|flow_prefix|withdrawal_prefix)['"]\s*=>/)
+ assert.doesNotMatch(number, /normalize_prefix|MAX_PREFIX_LENGTH|candidate\(/)
+
+ // 唯一入口：无前缀的统一流水号分配器。
+ assert.match(number, /public static function allocate\(\?\\?DateTimeInterface/)
+ assert.match(number, /YmdHis/)
+
+ // 订单号、资金流水号、提现单号、卡密渠道交易号全部收敛到该分配器。
+ assert.match(read('src/Payment/OrderRepositoryCore.php'), /BusinessNumber::allocate\(\)/)
+ assert.match(read('src/Finance/FinancialFlowService.php'), /BusinessNumber::allocate\(\)/)
+ assert.match(read('src/Payment/Withdrawal.php'), /BusinessNumber::allocate\(\)/)
+ assert.match(read('src/Payment/ChargeCard.php'), /BusinessNumber::allocate\(\)/)
})
test('ledger and business state write their flow before commit', () => {
@@ -35,10 +55,14 @@ test('ledger and business state write their flow before commit', () => {
test('native and front-end surfaces expose immutable business numbers', () => {
assert.match(read('src/Admin/Native/PayMenus.php'), /PayFlows::PAGE_SLUG/)
assert.match(read('src/Admin/Native/PayFlows.php'), /流水明细/)
- assert.match(read('src/Admin/Native/PayOrders.php'), /支付流水号/)
- assert.match(read('src/Admin/Native/PayWithdrawals.php'), /提现单号/)
- assert.match(read('src/Payment/UserOrders.php'), /\$view\['flow_number'\]/)
- assert.match(read('assets/js/order-center.js'), /\["流水号", order\.flow_number \|\| "—"\]/)
+ // 后台同时提供业务流水号与账本流水号两个口径
+ assert.match(read('src/Admin/Native/PayOrders.php'), /账本流水号/)
+ assert.match(read('src/Admin/Native/PayWithdrawals.php'), /esc_html__\('流水号'/)
+ assert.doesNotMatch(read('src/Admin/Native/PayWithdrawals.php'), /提现单号/)
+ // 前台订单详情只对外暴露统一流水号：账本流水号既不下发也不展示
+ assert.match(read('assets/js/order-center.js'), /\["流水号", order\.order_number\]/)
+ assert.doesNotMatch(read('assets/js/order-center.js'), /flow_number|账本流水号/)
+ assert.doesNotMatch(read('src/Payment/UserOrders.php'), /\$view\['flow_number'\]/)
assert.match(read('inc/helpers/user-center-renderers/credits-wallet-ledger.php'), /withdrawal_number/)
})
diff --git a/tests/widget-system/pay-card-contract.test.cjs b/tests/widget-system/pay-card-contract.test.cjs
index a96810f5..961e9921 100644
--- a/tests/widget-system/pay-card-contract.test.cjs
+++ b/tests/widget-system/pay-card-contract.test.cjs
@@ -40,7 +40,8 @@ test('paid article and sidebar widget use the Zibll purchase-card DOM', () => {
assert.match(pay, /function aksrt_get_paid_box_html/);
assert.match(pay, /pay-box zib-widget paid-box order-type-/);
assert.match(pay, /flex ac jb-green padding-10 em09/);
- assert.match(pay, /订单号/);
+ assert.match(pay, /流水号/);
+ assert.doesNotMatch(pay, /'订单号'/);
assert.match(pay, /支付时间/);
assert.match(pay, /支付金额/);
assert.match(pay, /hidden-box show/);