diff --git a/src/app/api/admin/subscription-plans/[id]/route.ts b/src/app/api/admin/subscription-plans/[id]/route.ts index 46d04fe..b2651f3 100644 --- a/src/app/api/admin/subscription-plans/[id]/route.ts +++ b/src/app/api/admin/subscription-plans/[id]/route.ts @@ -16,7 +16,8 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{ } // 确定最终 groupId:如果传了 group_id 用传入值,否则用现有值 - const finalGroupId = body.group_id !== undefined ? (body.group_id ? Number(body.group_id) : null) : existing.groupId; + const finalGroupId = + body.group_id !== undefined ? (body.group_id ? Number(body.group_id) : null) : existing.groupId; // 必须绑定分组才能保存 if (finalGroupId === null || finalGroupId === undefined) { @@ -44,10 +45,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{ where: { id }, data: { groupId: null, forSale: false }, }); - return NextResponse.json( - { error: '该分组在 Sub2API 中已被删除,已自动解绑,请重新选择分组' }, - { status: 409 }, - ); + return NextResponse.json({ error: '该分组在 Sub2API 中已被删除,已自动解绑,请重新选择分组' }, { status: 409 }); } if (body.price !== undefined && (typeof body.price !== 'number' || body.price <= 0 || body.price > 99999999.99)) { diff --git a/src/components/SubscriptionPlanCard.tsx b/src/components/SubscriptionPlanCard.tsx index 1e90625..7db0f1e 100644 --- a/src/components/SubscriptionPlanCard.tsx +++ b/src/components/SubscriptionPlanCard.tsx @@ -29,15 +29,7 @@ export interface PlanInfo { } /** 套餐信息展示(Header + 价格 + 描述 + 倍率/限额 + 特性),不含操作按钮 */ -export function PlanInfoDisplay({ - plan, - isDark, - locale, -}: { - plan: PlanInfo; - isDark: boolean; - locale: Locale; -}) { +export function PlanInfoDisplay({ plan, isDark, locale }: { plan: PlanInfo; isDark: boolean; locale: Locale }) { const unit = plan.validityUnit ?? 'day'; const periodLabel = formatValidityLabel(plan.validityDays, unit, locale); const periodSuffix = formatValiditySuffix(plan.validityDays, unit, locale); diff --git a/src/lib/order/service.ts b/src/lib/order/service.ts index bda10ff..3c890f3 100644 --- a/src/lib/order/service.ts +++ b/src/lib/order/service.ts @@ -689,9 +689,7 @@ export async function executeSubscriptionFulfillment(orderId: string): Promise s.group_id === order.subscriptionGroupId && s.status === 'active', - ); + const activeSub = userSubs.find((s) => s.group_id === order.subscriptionGroupId && s.status === 'active'); if (activeSub) { // 续费:从到期日往后推算天数