wanwu/sub2apipay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 金额上限校验、订阅详情展示优化、支付商品名称区分

Browse Source 
- 硬编码 MAX_AMOUNT=99999999.99，所有金额输入（API+前端）统一校验上限
- 管理后台订阅列表改为卡片布局，Sub2API 分组信息嵌套只读展示（平台/倍率/限额/模型）
- 用户端套餐卡片和确认页展示平台、倍率、用量限制
- 订阅订单支付商品名改为 "Sub2API 订阅 {分组名}"，余额充值保持原格式
This commit is contained in:
erio
2026-03-13 23:40:23 +08:00
parent ca03a501f2
commit 1bb11ee32b
8 changed files with 275 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

283
src/app/admin/subscriptions/page.tsx
View File

@@ -21,6 +21,12 @@ interface SubscriptionPlan {
sortOrder: number;
enabled: boolean;
groupExists: boolean;
groupPlatform: string | null;
groupRateMultiplier: number | null;
groupDailyLimit: number | null;
groupWeeklyLimit: number | null;
groupMonthlyLimit: number | null;
groupModelScopes: string[] | null;
}
interface Sub2ApiGroup {
@@ -129,6 +135,14 @@ function buildText(locale: Locale) {
unlimited: 'Unlimited',
resetIn: 'Reset in',
noGroup: 'Unknown Group',
groupInfo: 'Sub2API Group Info',
groupInfoReadonly: '(read-only, from Sub2API)',
platform: 'Platform',
rateMultiplier: 'Rate',
dailyLimit: 'Daily Limit',
weeklyLimit: 'Weekly Limit',
monthlyLimit: 'Monthly Limit',
modelScopes: 'Models',
}
: {
missingToken: '缺少管理员凭证',
@@ -201,6 +215,14 @@ function buildText(locale: Locale) {
unlimited: '无限制',
resetIn: '重置于',
noGroup: '未知分组',
groupInfo: 'Sub2API 分组信息',
groupInfoReadonly: '（只读，来自 Sub2API）',
platform: '平台',
rateMultiplier: '倍率',
dailyLimit: '日限额',
weeklyLimit: '周限额',
monthlyLimit: '月限额',
modelScopes: '模型',
};
}
@@ -679,115 +701,182 @@ function SubscriptionsContent() {
</button>
</div>
{/* Plans table */}
<div className={tableWrapCls}>
{plansLoading ? (
<div className={`py-12 text-center ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>{t.loading}</div>
) : plans.length === 0 ? (
<div className={`py-12 text-center ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>{t.noPlans}</div>
) : (
<table className="w-full">
<thead>
<tr className={`border-b ${rowBorderCls}`}>
<th className={thCls}>{t.colName}</th>
<th className={thCls}>{t.colGroup}</th>
<th className={thCls}>{t.colPrice}</th>
<th className={thCls}>{t.colOriginalPrice}</th>
<th className={thCls}>{t.colValidDays}</th>
<th className={thCls}>{t.colEnabled}</th>
<th className={thCls}>{t.colGroupStatus}</th>
<th className={thCls}>{t.colActions}</th>
</tr>
</thead>
<tbody>
{plans.map((plan) => (
<tr key={plan.id} className={`border-b ${rowBorderCls} last:border-b-0`}>
<td className={tdCls}>{plan.name}</td>
<td className={tdCls}>
<span className="font-mono text-xs">{plan.groupId}</span>
{plan.groupName && (
<span className={`ml-1 text-xs ${isDark ? 'text-slate-500' : 'text-slate-400'}`}>
({plan.groupName})
</span>
)}
</td>
<td className={tdCls}>{plan.price.toFixed(2)}</td>
<td className={tdCls}>
{plan.originalPrice != null ? plan.originalPrice.toFixed(2) : '-'}
</td>
<td className={tdCls}>
{plan.validDays}{' '}
{plan.validityUnit === 'month'
? t.unitMonth
: plan.validityUnit === 'week'
? t.unitWeek
: t.unitDay}
</td>
<td className={tdCls}>
<button
type="button"
onClick={() => handleToggleEnabled(plan)}
className={[
'relative inline-flex h-5 w-9 items-center rounded-full transition-colors',
plan.enabled ? 'bg-emerald-500' : isDark ? 'bg-slate-600' : 'bg-slate-300',
].join(' ')}
>
<span
className={[
'inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform',
plan.enabled ? 'translate-x-4.5' : 'translate-x-0.5',
].join(' ')}
/>
</button>
</td>
<td className={tdCls}>
{/* Plans cards */}
{plansLoading ? (
<div className={`py-12 text-center ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>{t.loading}</div>
) : plans.length === 0 ? (
<div className={`py-12 text-center ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>{t.noPlans}</div>
) : (
<div className="space-y-4">
{plans.map((plan) => (
<div
key={plan.id}
className={[
'rounded-xl border overflow-hidden',
isDark ? 'border-slate-700 bg-slate-800/70' : 'border-slate-200 bg-white shadow-sm',
].join(' ')}
>
{/* ── 套餐配置（上半部分） ── */}
<div className="p-4">
<div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-2">
<h3 className={['text-base font-semibold', isDark ? 'text-slate-100' : 'text-slate-900'].join(' ')}>
{plan.name}
</h3>
<span
className={[
'inline-block rounded-full px-2 py-0.5 text-xs font-medium',
plan.groupExists
? isDark
? 'bg-green-500/20 text-green-300'
: 'bg-green-50 text-green-700'
: isDark
? 'bg-red-500/20 text-red-300'
: 'bg-red-50 text-red-600',
? isDark ? 'bg-green-500/20 text-green-300' : 'bg-green-50 text-green-700'
: isDark ? 'bg-red-500/20 text-red-300' : 'bg-red-50 text-red-600',
].join(' ')}
>
{plan.groupExists ? t.groupExists : t.groupMissing}
</span>
</td>
<td className={tdCls}>
<div className="flex gap-2">
</div>
<div className="flex items-center gap-3">
{/* Toggle */}
<div className="flex items-center gap-1.5">
<span className={['text-xs', isDark ? 'text-slate-400' : 'text-slate-500'].join(' ')}>
{t.colEnabled}
</span>
<button
type="button"
onClick={() => openEdit(plan)}
onClick={() => handleToggleEnabled(plan)}
className={[
'rounded px-2 py-1 text-xs font-medium transition-colors',
isDark
? 'text-indigo-300 hover:bg-indigo-500/20'
: 'text-blue-600 hover:bg-blue-50',
'relative inline-flex h-5 w-9 items-center rounded-full transition-colors',
plan.enabled ? 'bg-emerald-500' : isDark ? 'bg-slate-600' : 'bg-slate-300',
].join(' ')}
>
{t.edit}
</button>
<button
type="button"
onClick={() => handleDelete(plan)}
className={[
'rounded px-2 py-1 text-xs font-medium transition-colors',
isDark ? 'text-red-400 hover:bg-red-500/20' : 'text-red-600 hover:bg-red-50',
].join(' ')}
>
{t.delete}
<span
className={[
'inline-block h-3.5 w-3.5 rounded-full bg-white transition-transform',
plan.enabled ? 'translate-x-4.5' : 'translate-x-0.5',
].join(' ')}
/>
</button>
</div>
</td>
</tr>
))}
</tbody>
</table>
)}
</div>
{/* Actions */}
<button
type="button"
onClick={() => openEdit(plan)}
className={[
'rounded px-2 py-1 text-xs font-medium transition-colors',
isDark ? 'text-indigo-300 hover:bg-indigo-500/20' : 'text-blue-600 hover:bg-blue-50',
].join(' ')}
>
{t.edit}
</button>
<button
type="button"
onClick={() => handleDelete(plan)}
className={[
'rounded px-2 py-1 text-xs font-medium transition-colors',
isDark ? 'text-red-400 hover:bg-red-500/20' : 'text-red-600 hover:bg-red-50',
].join(' ')}
>
{t.delete}
</button>
</div>
</div>
{/* Plan fields grid */}
<div className="grid grid-cols-2 sm:grid-cols-4 gap-x-4 gap-y-2 text-sm">
<div>
<span className={['text-xs', isDark ? 'text-slate-500' : 'text-slate-400'].join(' ')}>{t.colGroup}</span>
<div className={isDark ? 'text-slate-200' : 'text-slate-800'}>
<span className="font-mono text-xs">{plan.groupId}</span>
{plan.groupName && <span className={`ml-1 text-xs ${isDark ? 'text-slate-400' : 'text-slate-500'}`}>({plan.groupName})</span>}
</div>
</div>
<div>
<span className={['text-xs', isDark ? 'text-slate-500' : 'text-slate-400'].join(' ')}>{t.colPrice}</span>
<div className={isDark ? 'text-slate-200' : 'text-slate-800'}>
¥{plan.price.toFixed(2)}
{plan.originalPrice != null && (
<span className={`ml-1 line-through text-xs ${isDark ? 'text-slate-500' : 'text-slate-400'}`}>
¥{plan.originalPrice.toFixed(2)}
</span>
)}
</div>
</div>
<div>
<span className={['text-xs', isDark ? 'text-slate-500' : 'text-slate-400'].join(' ')}>{t.colValidDays}</span>
<div className={isDark ? 'text-slate-200' : 'text-slate-800'}>
{plan.validDays} {plan.validityUnit === 'month' ? t.unitMonth : plan.validityUnit === 'week' ? t.unitWeek : t.unitDay}
</div>
</div>
<div>
<span className={['text-xs', isDark ? 'text-slate-500' : 'text-slate-400'].join(' ')}>{t.fieldSortOrder}</span>
<div className={isDark ? 'text-slate-200' : 'text-slate-800'}>{plan.sortOrder}</div>
</div>
</div>
</div>
{/* ── Sub2API 分组信息（嵌套只读区域） ── */}
{plan.groupExists && (
<div className={['border-t px-4 py-3', isDark ? 'border-slate-700 bg-slate-900/40' : 'border-slate-100 bg-slate-50/80'].join(' ')}>
<div className="flex items-center gap-2 mb-2">
<span className={['text-xs font-medium', isDark ? 'text-slate-400' : 'text-slate-500'].join(' ')}>
{t.groupInfo}
</span>
<span className={['text-[10px]', isDark ? 'text-slate-600' : 'text-slate-400'].join(' ')}>
{t.groupInfoReadonly}
</span>
</div>
<div className="grid grid-cols-2 sm:grid-cols-4 gap-x-4 gap-y-2 text-xs">
{plan.groupPlatform && (
<div>
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.platform}</span>
<div className={isDark ? 'text-slate-300' : 'text-slate-600'}>{plan.groupPlatform}</div>
</div>
)}
{plan.groupRateMultiplier != null && (
<div>
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.rateMultiplier}</span>
<div className={isDark ? 'text-slate-300' : 'text-slate-600'}>{plan.groupRateMultiplier}x</div>
</div>
)}
<div>
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.dailyLimit}</span>
<div className={isDark ? 'text-slate-300' : 'text-slate-600'}>
{plan.groupDailyLimit != null ? `$${plan.groupDailyLimit}` : t.unlimited}
</div>
</div>
<div>
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.weeklyLimit}</span>
<div className={isDark ? 'text-slate-300' : 'text-slate-600'}>
{plan.groupWeeklyLimit != null ? `$${plan.groupWeeklyLimit}` : t.unlimited}
</div>
</div>
<div>
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.monthlyLimit}</span>
<div className={isDark ? 'text-slate-300' : 'text-slate-600'}>
{plan.groupMonthlyLimit != null ? `$${plan.groupMonthlyLimit}` : t.unlimited}
</div>
</div>
{plan.groupModelScopes && plan.groupModelScopes.length > 0 && (
<div className="sm:col-span-3">
<span className={isDark ? 'text-slate-500' : 'text-slate-400'}>{t.modelScopes}</span>
<div className="flex flex-wrap gap-1 mt-0.5">
{plan.groupModelScopes.map((m) => (
<span
key={m}
className={['inline-block rounded px-1.5 py-0.5 text-[10px]', isDark ? 'bg-slate-700 text-slate-300' : 'bg-slate-200 text-slate-600'].join(' ')}
>
{m}
</span>
))}
</div>
</div>
)}
</div>
</div>
)}
</div>
))}
</div>
)}
</>
)}
@@ -1035,7 +1124,8 @@ function SubscriptionsContent() {
<input
type="number"
step="0.01"
min="0"
min="0.01"
max="99999999.99"
value={formPrice}
onChange={(e) => setFormPrice(e.target.value)}
className={inputCls}
@@ -1047,7 +1137,8 @@ function SubscriptionsContent() {
<input
type="number"
step="0.01"
min="0"
min="0.01"
max="99999999.99"
value={formOriginalPrice}
onChange={(e) => setFormOriginalPrice(e.target.value)}
className={inputCls}

7
src/app/api/admin/subscription-plans/[id]/route.ts
View File

@@ -27,8 +27,11 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
}
}
if (body.price !== undefined && (typeof body.price !== 'number' || body.price <= 0)) {
return NextResponse.json({ error: 'price 必须是正数' }, { status: 400 });
if (body.price !== undefined && (typeof body.price !== 'number' || body.price <= 0 || body.price > 99999999.99)) {
return NextResponse.json({ error: 'price 必须是 0.01 ~ 99999999.99 之间的数值' }, { status: 400 });
}
if (body.original_price !== undefined && body.original_price !== null && (typeof body.original_price !== 'number' || body.original_price <= 0 || body.original_price > 99999999.99)) {
return NextResponse.json({ error: 'original_price 必须是 0.01 ~ 99999999.99 之间的数值' }, { status: 400 });
}
if (body.validity_days !== undefined && (!Number.isInteger(body.validity_days) || body.validity_days <= 0)) {
return NextResponse.json({ error: 'validity_days 必须是正整数' }, { status: 400 });

16
src/app/api/admin/subscription-plans/route.ts
View File

@@ -16,8 +16,9 @@ export async function GET(request: NextRequest) {
plans.map(async (plan) => {
let groupExists = false;
let groupName: string | null = null;
let group: Awaited<ReturnType<typeof getGroup>> | null = null;
try {
const group = await getGroup(plan.groupId);
group = await getGroup(plan.groupId);
groupExists = group !== null;
groupName = group?.name ?? null;
} catch {
@@ -37,6 +38,12 @@ export async function GET(request: NextRequest) {
sortOrder: plan.sortOrder,
enabled: plan.forSale,
groupExists,
groupPlatform: group?.platform ?? null,
groupRateMultiplier: group?.rate_multiplier ?? null,
groupDailyLimit: group?.daily_limit_usd ?? null,
groupWeeklyLimit: group?.weekly_limit_usd ?? null,
groupMonthlyLimit: group?.monthly_limit_usd ?? null,
groupModelScopes: group?.supported_model_scopes ?? null,
createdAt: plan.createdAt,
updatedAt: plan.updatedAt,
};
@@ -61,8 +68,11 @@ export async function POST(request: NextRequest) {
return NextResponse.json({ error: '缺少必填字段: group_id, name, price' }, { status: 400 });
}
if (typeof price !== 'number' || price <= 0) {
return NextResponse.json({ error: 'price 必须是正数' }, { status: 400 });
if (typeof price !== 'number' || price <= 0 || price > 99999999.99) {
return NextResponse.json({ error: 'price 必须是 0.01 ~ 99999999.99 之间的数值' }, { status: 400 });
}
if (original_price !== undefined && original_price !== null && (typeof original_price !== 'number' || original_price <= 0 || original_price > 99999999.99)) {
return NextResponse.json({ error: 'original_price 必须是 0.01 ~ 99999999.99 之间的数值' }, { status: 400 });
}
if (validity_days !== undefined && (!Number.isInteger(validity_days) || validity_days <= 0)) {
return NextResponse.json({ error: 'validity_days 必须是正整数' }, { status: 400 });

2
src/app/api/orders/route.ts
View File

@@ -8,7 +8,7 @@ import { handleApiError } from '@/lib/utils/api';
const createOrderSchema = z.object({
token: z.string().min(1),
amount: z.number().positive(),
amount: z.number().positive().max(99999999.99),
payment_type: z.string().min(1),
src_host: z.string().max(253).optional(),
src_url: z.string().max(2048).optional(),

6
src/app/api/subscription-plans/route.ts
View File

@@ -24,9 +24,10 @@ export async function GET(request: NextRequest) {
const results = await Promise.all(
plans.map(async (plan) => {
let groupActive = false;
let group: Awaited<ReturnType<typeof getGroup>> = null;
let groupInfo: { daily_limit_usd: number | null; weekly_limit_usd: number | null; monthly_limit_usd: number | null } | null = null;
try {
const group = await getGroup(plan.groupId);
group = await getGroup(plan.groupId);
groupActive = group !== null && group.status === 'active';
if (group) {
groupInfo = {
@@ -44,6 +45,7 @@ export async function GET(request: NextRequest) {
return {
id: plan.id,
groupId: plan.groupId,
groupName: group?.name ?? null,
name: plan.name,
description: plan.description,
price: Number(plan.price),
@@ -51,6 +53,8 @@ export async function GET(request: NextRequest) {
validityDays: plan.validityDays,
validityUnit: plan.validityUnit,
features: plan.features ? JSON.parse(plan.features) : [],
platform: group?.platform ?? null,
rateMultiplier: group?.rate_multiplier ?? null,
limits: groupInfo,
};
}),

40
src/components/SubscriptionConfirm.tsx
View File

@@ -62,11 +62,11 @@ export default function SubscriptionConfirm({
{/* Plan info card */}
<div
className={[
'rounded-xl border p-4',
'rounded-xl border p-4 space-y-3',
isDark ? 'border-slate-700 bg-slate-800/80' : 'border-slate-200 bg-slate-50',
].join(' ')}
>
<div className="mb-2 flex items-center justify-between">
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<span className={['text-base font-semibold', isDark ? 'text-slate-100' : 'text-slate-900'].join(' ')}>
{plan.name}
@@ -81,6 +81,24 @@ export default function SubscriptionConfirm({
</span>
</div>
</div>
{/* Platform & Rate tags */}
{(plan.platform || plan.rateMultiplier != null) && (
<div className={['flex flex-wrap gap-2 text-xs', isDark ? 'text-slate-400' : 'text-slate-500'].join(' ')}>
{plan.platform && (
<span className={['inline-flex items-center rounded-md px-2 py-0.5', isDark ? 'bg-slate-700/60' : 'bg-slate-100'].join(' ')}>
{pickLocaleText(locale, '平台', 'Platform')}: {plan.platform}
</span>
)}
{plan.rateMultiplier != null && (
<span className={['inline-flex items-center rounded-md px-2 py-0.5', isDark ? 'bg-slate-700/60' : 'bg-slate-100'].join(' ')}>
{pickLocaleText(locale, '倍率', 'Rate')}: {plan.rateMultiplier}x
</span>
)}
</div>
)}
{/* Features */}
{plan.features.length > 0 && (
<ul className="space-y-1">
{plan.features.map((feature) => (
@@ -93,6 +111,24 @@ export default function SubscriptionConfirm({
))}
</ul>
)}
{/* Usage limits */}
{plan.limits && (plan.limits.daily_limit_usd != null || plan.limits.weekly_limit_usd != null || plan.limits.monthly_limit_usd != null) && (
<div className={['rounded-lg p-2.5 text-xs', isDark ? 'bg-slate-900/60 text-slate-400' : 'bg-white/80 text-slate-500'].join(' ')}>
<p className="mb-1 font-medium">{pickLocaleText(locale, '用量限制', 'Usage Limits')}</p>
<div className="space-y-0.5">
{plan.limits.daily_limit_usd != null && (
<p>{pickLocaleText(locale, `每日: $${plan.limits.daily_limit_usd}`, `Daily: $${plan.limits.daily_limit_usd}`)}</p>
)}
{plan.limits.weekly_limit_usd != null && (
<p>{pickLocaleText(locale, `每周: $${plan.limits.weekly_limit_usd}`, `Weekly: $${plan.limits.weekly_limit_usd}`)}</p>
)}
{plan.limits.monthly_limit_usd != null && (
<p>{pickLocaleText(locale, `每月: $${plan.limits.monthly_limit_usd}`, `Monthly: $${plan.limits.monthly_limit_usd}`)}</p>
)}
</div>
</div>
)}
</div>
{/* Payment method selector */}

19
src/components/SubscriptionPlanCard.tsx
View File

@@ -8,6 +8,7 @@ import { formatValidityLabel, formatValiditySuffix, type ValidityUnit } from '@/
export interface PlanInfo {
id: string;
groupId: number;
groupName: string | null;
name: string;
price: number;
originalPrice: number | null;
@@ -15,6 +16,8 @@ export interface PlanInfo {
validityUnit?: ValidityUnit;
features: string[];
description: string | null;
platform: string | null;
rateMultiplier: number | null;
limits: {
daily_limit_usd: number | null;
weekly_limit_usd: number | null;
@@ -76,6 +79,22 @@ export default function SubscriptionPlanCard({ plan, onSubscribe, isDark, locale
</p>
)}
{/* Platform & Rate */}
{(plan.platform || plan.rateMultiplier != null) && (
<div className={['mb-3 flex flex-wrap gap-2 text-xs', isDark ? 'text-slate-400' : 'text-slate-500'].join(' ')}>
{plan.platform && (
<span className={['inline-flex items-center gap-1 rounded-md px-2 py-0.5', isDark ? 'bg-slate-700/60' : 'bg-slate-100'].join(' ')}>
{pickLocaleText(locale, '平台', 'Platform')}: {plan.platform}
</span>
)}
{plan.rateMultiplier != null && (
<span className={['inline-flex items-center gap-1 rounded-md px-2 py-0.5', isDark ? 'bg-slate-700/60' : 'bg-slate-100'].join(' ')}>
{pickLocaleText(locale, '倍率', 'Rate')}: {plan.rateMultiplier}x
</span>
)}
</div>
)}
{/* Features */}
{plan.features.length > 0 && (
<ul className="mb-4 space-y-2">

8
src/lib/order/service.ts
View File

@@ -15,6 +15,8 @@ import { getBizDayStartUTC } from '@/lib/time/biz-day';
import { buildOrderResultUrl, createOrderStatusAccessToken } from '@/lib/order/status-access';
const MAX_PENDING_ORDERS = 3;
/** Decimal(10,2) 允许的最大金额 */
export const MAX_AMOUNT = 99999999.99;
function message(locale: Locale, zh: string, en: string): string {
return pickLocaleText(locale, zh, en);
@@ -58,6 +60,7 @@ export async function createOrder(input: CreateOrderInput): Promise<CreateOrderR
// ── 订阅订单前置校验 ──
let subscriptionPlan: { id: string; groupId: number; price: Prisma.Decimal; validityDays: number; validityUnit: string; name: string } | null = null;
let subscriptionGroupName = '';
if (orderType === 'subscription') {
if (!input.planId) {
throw new OrderError('INVALID_INPUT', message(locale, '订阅订单必须指定套餐', 'Subscription order requires a plan'), 400);
@@ -75,6 +78,7 @@ export async function createOrder(input: CreateOrderInput): Promise<CreateOrderR
410,
);
}
subscriptionGroupName = group?.name || plan.name;
subscriptionPlan = plan;
// 订阅订单金额使用服务端套餐价格，不信任客户端
input.amount = Number(plan.price);
@@ -216,7 +220,9 @@ export async function createOrder(input: CreateOrderInput): Promise<CreateOrderR
orderId: order.id,
amount: payAmountNum,
paymentType: input.paymentType,
subject: `${env.PRODUCT_NAME} ${payAmountStr} CNY`,
subject: subscriptionPlan
? `Sub2API 订阅 ${subscriptionGroupName || subscriptionPlan.name}`
: `${env.PRODUCT_NAME} ${payAmountStr} CNY`,
notifyUrl,
returnUrl,
clientIp: input.clientIp,