feat(payment): 通用卡密兑换弹窗并修正核销订单实付与订单名称
- /user/balance/ 余额卡片入口改为通用「卡密兑换」弹窗:请求不带类型, 后端按卡密自动识别余额/会员/积分;卡号输入恒展示且选填 - 后台「余额充值 → 卡密充值」语义更新为「卡密兑换」,开关更名 「启用卡密兑换功能」(设置键不变),双源 schema 同步并重建 SPA - 删除死代码:credits-vip.php 死文件、credits-balance.php 内联积分 兑换块、/pay/card-pass/options 路由与 rest_options、labels 数组、 asset_points_card_description/password_only 死字段及内联块专属 CSS - 卡密核销订单实付恒 0:create_redeem_order 源头写 0,UserOrders 对 card_pass 订单视图层归零覆盖历史行(不迁移数据) - 订单名称按 note.meta 生成:卡密兑换-余额充值X / 卡密兑换-积分充值X / 购入[会员档位名]X天(永久) - 新增契约 card-pass-universal-redeem.test.cjs,收紧 user-assets-layout 契约(禁 .uc-card-pass 根类回潮)
This commit is contained in:
1 parent
ba8d4b1b90
commit
3481620ed0
14 files changed
+213
-415
No files matched your search
@@ -186,6 +186,12 @@ class UserOrders {
|
||||
$image = $this->resolve_image($meta, $product_id);
|
||||
$group = $this->status_group($status);
|
||||
$payment_method = sanitize_key((string) ($order['payment_method'] ?? ''));
|
||||
// 卡密核销不发生任何真实支付(现金在售卡时已确认),实付恒为 0,
|
||||
// 视图层统一归零以覆盖历史行(历史数据不做迁移)。
|
||||
$amount = (string) ($order['amount'] ?? '0.00');
|
||||
if ($payment_method === 'card_pass') {
|
||||
$amount = $is_points ? '0' : '0.00';
|
||||
}
|
||||
$can_pay = $group === OrderCenterQuery::STATUS_PENDING;
|
||||
$can_cancel = $group === OrderCenterQuery::STATUS_PENDING;
|
||||
$order_number = (string) ($order['order_number'] ?? '');
|
||||
@@ -194,7 +200,7 @@ class UserOrders {
|
||||
$view = [
|
||||
'id' => (int) ($order['id'] ?? 0),
|
||||
'order_number' => $order_number,
|
||||
'amount' => (string) ($order['amount'] ?? '0.00'),
|
||||
'amount' => $amount,
|
||||
'currency' => $currency,
|
||||
'currency_symbol' => $is_points
|
||||
? (class_exists('\AKSRT\Settings\Settings') ? \AKSRT\Settings\Settings::get_currency_name() : __('积分', 'aksrt'))
|
||||
@@ -288,6 +294,13 @@ class UserOrders {
|
||||
|
||||
/** @param array<string, mixed> $meta */
|
||||
private function resolve_title(array $meta, string $type, int $product_id, string $fallback): string {
|
||||
// 卡密核销订单:按 note.meta 生成可读名称(余额/积分卡记面额,会员卡记档位与时长)。
|
||||
if (!empty($meta['card_pass'])) {
|
||||
$title = $this->resolve_card_pass_title($meta);
|
||||
if ($title !== '') {
|
||||
return $title;
|
||||
}
|
||||
}
|
||||
foreach (['product_title', 'title', 'package_title'] as $key) {
|
||||
if (!empty($meta[$key]) && is_string($meta[$key])) {
|
||||
return (string) $meta[$key];
|
||||
@@ -315,6 +328,43 @@ class UserOrders {
|
||||
return $fallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* 卡密核销订单名称:
|
||||
* - 余额卡:卡密兑换-余额充值{面额}
|
||||
* - 积分卡:卡密兑换-积分充值{点数}
|
||||
* - 会员卡:购入[{会员档位名}]{N}天(永久卡为「永久」)
|
||||
*
|
||||
* @param array<string, mixed> $meta
|
||||
*/
|
||||
private function resolve_card_pass_title(array $meta): string {
|
||||
$card_meta = is_array($meta['meta'] ?? null) ? $meta['meta'] : [];
|
||||
$card_type = sanitize_key((string) ($meta['card_type'] ?? ''));
|
||||
if ($card_type === ChargeCard::TYPE_BALANCE) {
|
||||
$amount = (string) ($card_meta['amount'] ?? '');
|
||||
if (str_contains($amount, '.')) {
|
||||
$amount = rtrim(rtrim($amount, '0'), '.');
|
||||
}
|
||||
return __('卡密兑换-余额充值', 'aksrt') . $amount;
|
||||
}
|
||||
if ($card_type === ChargeCard::TYPE_CREDITS) {
|
||||
return __('卡密兑换-积分充值', 'aksrt') . (string) max(0, (int) ($card_meta['points'] ?? 0));
|
||||
}
|
||||
if ($card_type === ChargeCard::TYPE_VIP) {
|
||||
$level = max(1, min(2, (int) ($card_meta['level'] ?? 1)));
|
||||
$days = max(0, (int) ($card_meta['days'] ?? 0));
|
||||
$levels = class_exists('\AKSRT\Settings\Settings')
|
||||
? (\AKSRT\Settings\Settings::get_payment_vip_settings()['levels'] ?? [])
|
||||
: [];
|
||||
$level_name = is_array($levels) ? (string) ($levels[$level]['name'] ?? '') : '';
|
||||
if ($level_name === '') {
|
||||
$level_name = 'VIP' . $level;
|
||||
}
|
||||
$suffix = $days > 0 ? sprintf(__('%d天', 'aksrt'), $days) : __('永久', 'aksrt');
|
||||
return sprintf(__('购入[%1$s]%2$s', 'aksrt'), $level_name, $suffix);
|
||||
}
|
||||
return '';
|
||||
}
|
||||
|
||||
/** @param array<string, mixed> $meta */
|
||||
private function resolve_image(array $meta, int $product_id): string {
|
||||
if (!empty($meta['thumb']) && is_string($meta['thumb'])) {
|
||||
|
||||
Reference in new issue
Block a user