From 38156bd4efaf317427256f3582c398abc3648078 Mon Sep 17 00:00:00 2001
From: erio <asakifeng@gmail.com>
Date: Fri, 13 Mar 2026 22:30:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E9=98=85=E5=A5=97=E9=A4=90=20A?=
 =?UTF-8?q?PI=20features=20=E5=AD=97=E6=AE=B5=E5=BA=8F=E5=88=97=E5=8C=96?=
 =?UTF-8?q?=E5=8F=8A=E8=BF=94=E5=9B=9E=E6=A0=BC=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- POST/PUT 写入前 JSON.stringify(features)，修复数组写入 TEXT 列报错
- GET/POST/PUT 返回时统一字段映射（validDays/enabled/groupName/features 数组）
---
 .../admin/subscription-plans/[id]/route.ts    | 15 +++++++--
 src/app/api/admin/subscription-plans/route.ts | 32 ++++++++++++++++---
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/app/api/admin/subscription-plans/[id]/route.ts b/src/app/api/admin/subscription-plans/[id]/route.ts
index b60e47e..ba471c5 100644
--- a/src/app/api/admin/subscription-plans/[id]/route.ts
+++ b/src/app/api/admin/subscription-plans/[id]/route.ts
@@ -37,7 +37,7 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
     if (body.validity_unit !== undefined && ['day', 'week', 'month'].includes(body.validity_unit)) {
       data.validityUnit = body.validity_unit;
     }
-    if (body.features !== undefined) data.features = body.features;
+    if (body.features !== undefined) data.features = body.features ? JSON.stringify(body.features) : null;
     if (body.for_sale !== undefined) data.forSale = body.for_sale;
     if (body.sort_order !== undefined) data.sortOrder = body.sort_order;
 
@@ -47,9 +47,20 @@ export async function PUT(request: NextRequest, { params }: { params: Promise<{
     });
 
     return NextResponse.json({
-      ...plan,
+      id: plan.id,
+      groupId: String(plan.groupId),
+      groupName: null,
+      name: plan.name,
+      description: plan.description,
       price: Number(plan.price),
       originalPrice: plan.originalPrice ? Number(plan.originalPrice) : null,
+      validDays: plan.validityDays,
+      validityUnit: plan.validityUnit,
+      features: plan.features ? JSON.parse(plan.features) : [],
+      sortOrder: plan.sortOrder,
+      enabled: plan.forSale,
+      createdAt: plan.createdAt,
+      updatedAt: plan.updatedAt,
     });
   } catch (error) {
     console.error('Failed to update subscription plan:', error);
diff --git a/src/app/api/admin/subscription-plans/route.ts b/src/app/api/admin/subscription-plans/route.ts
index 3c335c8..9fa970d 100644
--- a/src/app/api/admin/subscription-plans/route.ts
+++ b/src/app/api/admin/subscription-plans/route.ts
@@ -11,21 +11,34 @@ export async function GET(request: NextRequest) {
       orderBy: { sortOrder: 'asc' },
     });
 
-    // 并发检查每个套餐对应的 Sub2API 分组是否仍然存在
+    // 并发检查每个套餐对应的 Sub2API 分组是否仍然存在，并获取分组名称
     const results = await Promise.all(
       plans.map(async (plan) => {
         let groupExists = false;
+        let groupName: string | null = null;
         try {
           const group = await getGroup(plan.groupId);
           groupExists = group !== null;
+          groupName = group?.name ?? null;
         } catch {
           groupExists = false;
         }
         return {
-          ...plan,
+          id: plan.id,
+          groupId: String(plan.groupId),
+          groupName,
+          name: plan.name,
+          description: plan.description,
           price: Number(plan.price),
           originalPrice: plan.originalPrice ? Number(plan.originalPrice) : null,
+          validDays: plan.validityDays,
+          validityUnit: plan.validityUnit,
+          features: plan.features ? JSON.parse(plan.features) : [],
+          sortOrder: plan.sortOrder,
+          enabled: plan.forSale,
           groupExists,
+          createdAt: plan.createdAt,
+          updatedAt: plan.updatedAt,
         };
       }),
     );
@@ -69,7 +82,7 @@ export async function POST(request: NextRequest) {
         originalPrice: original_price ?? null,
         validityDays: validity_days ?? 30,
         validityUnit: ['day', 'week', 'month'].includes(validity_unit) ? validity_unit : 'day',
-        features: features ?? null,
+        features: features ? JSON.stringify(features) : null,
         forSale: for_sale ?? false,
         sortOrder: sort_order ?? 0,
       },
@@ -77,9 +90,20 @@ export async function POST(request: NextRequest) {
 
     return NextResponse.json(
       {
-        ...plan,
+        id: plan.id,
+        groupId: String(plan.groupId),
+        groupName: null,
+        name: plan.name,
+        description: plan.description,
         price: Number(plan.price),
         originalPrice: plan.originalPrice ? Number(plan.originalPrice) : null,
+        validDays: plan.validityDays,
+        validityUnit: plan.validityUnit,
+        features: plan.features ? JSON.parse(plan.features) : [],
+        sortOrder: plan.sortOrder,
+        enabled: plan.forSale,
+        createdAt: plan.createdAt,
+        updatedAt: plan.updatedAt,
       },
       { status: 201 },
     );