From d734179302ab3c2a7a2aafe7f03ea150b026e441 Mon Sep 17 00:00:00 2001
From: Zixin Zhou <zhouzixin@apache.org>
Date: Wed, 27 Aug 2025 23:56:27 +0800
Subject: [PATCH] update pay

---
 app/dashboard/page.tsx          |  3 ++-
 app/payment-success/page.tsx    |  3 ++-
 app/pricing/page.tsx            | 32 ++++++++++++++++----------------
 components/pages/home-page2.tsx | 17 ++++++-----------
 lib/stripe.ts                   |  6 +++---
 5 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
index 6047257..036c12f 100644
--- a/app/dashboard/page.tsx
+++ b/app/dashboard/page.tsx
@@ -58,7 +58,8 @@ export default function DashboardPage() {
   // 获取支付详情
   const fetchPaymentDetails = async (sessionId: string) => {
     try {
-      const response = await fetch(`/api/payment/checkout-status/${sessionId}?user_id=test_user_123`);
+      const User = JSON.parse(localStorage.getItem("currentUser") || "{}");
+      const response = await fetch(`/api/payment/checkout-status/${sessionId}?user_id=${User.id}`);
       const result = await response.json();
       
       if (result.successful && result.data) {
diff --git a/app/payment-success/page.tsx b/app/payment-success/page.tsx
index 66963da..589d424 100644
--- a/app/payment-success/page.tsx
+++ b/app/payment-success/page.tsx
@@ -42,7 +42,8 @@ export default function PaymentSuccessPage() {
         try {
           // 使用新的Checkout Session状态查询
           const { getCheckoutSessionStatus } = await import('@/lib/stripe');
-          const result = await getCheckoutSessionStatus(sessionId, 'test_user_123'); // 临时测试用户ID
+          const User = JSON.parse(localStorage.getItem("currentUser") || "{}");
+          const result = await getCheckoutSessionStatus(sessionId, User.id);
           
           if (result.successful && result.data) {
             setPaymentData(result.data);
diff --git a/app/pricing/page.tsx b/app/pricing/page.tsx
index 4a8316d..7f61a3a 100644
--- a/app/pricing/page.tsx
+++ b/app/pricing/page.tsx
@@ -9,7 +9,7 @@ import { fetchSubscriptionPlans, SubscriptionPlan } from '@/lib/stripe';
 
 export default function PricingPage() {
   const router = useRouter();
-  const [billingCycle, setBillingCycle] = useState<'monthly' | 'yearly'>('monthly');
+  const [billingCycle, setBillingCycle] = useState<'month' | 'year'>('month');
   const [plans, setPlans] = useState<SubscriptionPlan[]>([]);
 
   // 从后端获取订阅计划数据
@@ -28,15 +28,15 @@ export default function PricingPage() {
 
   // 转换后端数据为前端显示格式，保持原有的数据结构
   const transformPlanForDisplay = (plan: SubscriptionPlan) => {
-    const monthlyPrice = plan.price_monthly / 100; // 后端存储的是分，转换为元
-    const yearlyPrice = plan.price_yearly / 100;
+    const monthlyPrice = plan.price_month / 100; // 后端存储的是分，转换为元
+    const yearlyPrice = plan.price_year / 100;
     
     return {
       name: plan.name,
       displayName: plan.display_name,
       price: { 
-        monthly: monthlyPrice, 
-        yearly: yearlyPrice 
+        month: monthlyPrice, 
+        year: yearlyPrice 
       },
       description: plan.description,
       features: plan.features || [],
@@ -103,16 +103,16 @@ export default function PricingPage() {
             
             <div className="inline-flex items-center bg-gray-900/50 rounded-full p-1">
               <button
-                onClick={() => setBillingCycle('yearly')}
+                onClick={() => setBillingCycle('year')}
                 className={`flex items-center justify-center px-6 py-2.5 rounded-full transition-all duration-300 ease-out font-medium text-base ${
-                  billingCycle === 'yearly'
+                  billingCycle === 'year'
                     ? 'bg-gradient-to-r from-pink-500 to-purple-600 text-white'
                     : 'text-gray-300 hover:text-white'
                 }`}
               >
                 Pay Yearly
                 <span className={`ml-2 text-sm ${
-                  billingCycle === 'yearly' 
+                  billingCycle === 'year' 
                     ? 'text-white/90' 
                     : 'text-gray-400'
                 }`}>
@@ -120,9 +120,9 @@ export default function PricingPage() {
                 </span>
               </button>
               <button
-                onClick={() => setBillingCycle('monthly')}
+                onClick={() => setBillingCycle('month')}
                 className={`px-6 py-2.5 rounded-full transition-all duration-300 ease-out font-medium text-base ${
-                  billingCycle === 'monthly'
+                  billingCycle === 'month'
                     ? 'bg-gradient-to-r from-pink-500 to-purple-600 text-white'
                     : 'text-gray-300 hover:text-white'
                 }`}
@@ -165,16 +165,16 @@ export default function PricingPage() {
           {/* Billing Toggle */}
           <div className="inline-flex items-center bg-gray-900/50 rounded-full p-1">
             <button
-              onClick={() => setBillingCycle('yearly')}
+              onClick={() => setBillingCycle('year')}
               className={`flex items-center justify-center px-6 py-2.5 rounded-full transition-all duration-300 ease-out font-medium text-base ${
-                billingCycle === 'yearly'
+                billingCycle === 'year'
                   ? 'bg-gradient-to-r from-pink-500 to-purple-600 text-white'
                   : 'text-gray-300 hover:text-white'
               }`}
             >
               Pay Yearly
               <span className={`ml-2 text-sm ${
-                billingCycle === 'yearly' 
+                billingCycle === 'year' 
                   ? 'text-white/90' 
                   : 'text-gray-400'
               }`}>
@@ -182,9 +182,9 @@ export default function PricingPage() {
               </span>
             </button>
             <button
-              onClick={() => setBillingCycle('monthly')}
+              onClick={() => setBillingCycle('month')}
               className={`px-6 py-2.5 rounded-full transition-all duration-300 ease-out font-medium text-base ${
-                billingCycle === 'monthly'
+                billingCycle === 'month'
                   ? 'bg-gradient-to-r from-pink-500 to-purple-600 text-white'
                   : 'text-gray-300 hover:text-white'
               }`}
@@ -234,7 +234,7 @@ export default function PricingPage() {
                           <>
                             <span className="text-5xl">${displayPlan.price[billingCycle]}</span>
                             <span className="text-lg text-gray-400 font-normal">
-                              /{billingCycle === 'monthly' ? 'month' : 'year'}
+                              /{billingCycle === 'month' ? 'month' : 'year'}
                             </span>
                           </>
                         )}
diff --git a/components/pages/home-page2.tsx b/components/pages/home-page2.tsx
index 50c4ec7..08ea5a9 100644
--- a/components/pages/home-page2.tsx
+++ b/components/pages/home-page2.tsx
@@ -8,19 +8,14 @@ import { VideoCarouselLayout } from '@/components/video-carousel-layout';
 import { VideoGridLayout } from '@/components/video-grid-layout';
 import { motion, AnimatePresence } from "framer-motion";
 import { LiquidButton } from "@/components/ui/liquid-glass-button";
-import {
-  createScriptProject,
-  CreateScriptProjectRequest
-} from '@/api/script_project';
-import {
-  ProjectTypeEnum,
-  ModeEnum,
-  ResolutionEnum
-} from '@/app/model/enums';
 import {
   getResourcesList,
   Resource
 } from '@/api/resources';
+import {
+  getCheckoutSessionStatus, 
+  PaymentStatusResponse
+} from "@/lib/stripe";
 
 export function HomePage2() {
   const router = useRouter();
@@ -85,8 +80,8 @@ export function HomePage2() {
   // 获取支付详情
   const fetchPaymentDetails = async (sessionId: string) => {
     try {
-      const response = await fetch(`/api/payment/checkout-status/${sessionId}?user_id=test_user_123`);
-      const result = await response.json();
+      const User = JSON.parse(localStorage.getItem("currentUser") || "{}");
+      const result: PaymentStatusResponse = await getCheckoutSessionStatus(sessionId, User.id);
       
       if (result.successful && result.data) {
         setPaymentData(result.data);
diff --git a/lib/stripe.ts b/lib/stripe.ts
index af1b3ff..49e883f 100644
--- a/lib/stripe.ts
+++ b/lib/stripe.ts
@@ -9,8 +9,8 @@ export interface SubscriptionPlan {
   name: string;
   display_name: string;
   description: string;
-  price_monthly: number;
-  price_yearly: number;
+  price_month: number;
+  price_year: number;
   features: string[];
   is_free: boolean;
   is_popular: boolean;
@@ -34,7 +34,7 @@ export type PaymentStatusResponse = ApiResponse<PaymentStatusData>;
 export interface CreateCheckoutSessionRequest {
     user_id: string;
     plan_name: string;
-    billing_cycle: 'monthly' | 'yearly';
+    billing_cycle: 'month' | 'year';
 }
 
 export interface CreateCheckoutSessionData {