🐛 fix(payment): Fix payment related type definitions and update payment method references

apps/admin/app/dashboard/order/page.tsx

@@ -116,7 +116,7 @@ export default function Page(props: any) {
                 <ul className='grid gap-3'>
                   <li className='flex items-center justify-between'>
                     <span className='text-muted-foreground'>{t('method')}</span>
-                    <span>{t(`methods.${row.original.method}`)}</span>
+                    <span>{row.original?.payment?.name || row.original?.payment?.platform}</span>
                   </li>
                 </ul>
               </HoverCardContent>

apps/admin/services/admin/index.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-
+ 
 // API 更新时间：
 // API 唯一标识：
 import * as ads from './ads';

apps/admin/services/admin/typings.d.ts

@@ -224,7 +224,7 @@ declare namespace API {
     coupon_discount?: number;
     commission: number;
     fee_amount: number;
-    method?: string;
+    payment_id: number;
     trade_no?: string;
     status?: number;
     subscribe_id?: number;
@@ -493,7 +493,7 @@ declare namespace API {
   };
 
   type GetAvailablePaymentMethodsResponse = {
-    list: PaymenMethod[];
+    list: PaymentMethod[];
   };
 
   type GetCouponListParams = {
@@ -921,7 +921,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
-    method: string;
+    payment: PaymentMethod;
     fee_amount: number;
     trade_no: string;
     status: number;
@@ -943,6 +943,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
+    payment: PaymentMethod;
     method: string;
     fee_amount: number;
     trade_no: string;
@@ -961,17 +962,6 @@ declare namespace API {
     list?: OrdersStatistics[];
   };
 
-  type PaymenMethod = {
-    id: number;
-    name: string;
-    platform: string;
-    description: string;
-    icon: string;
-    fee_mode: number;
-    fee_percent: number;
-    fee_amount: number;
-  };
-
   type PaymentConfig = {
     id: number;
     name: string;
@@ -986,6 +976,17 @@ declare namespace API {
     enable: boolean;
   };
 
+  type PaymentMethod = {
+    id: number;
+    name: string;
+    platform: string;
+    description: string;
+    icon: string;
+    fee_mode: number;
+    fee_percent: number;
+    fee_amount: number;
+  };
+
   type PaymentMethodDetail = {
     id: number;
     name: string;
@@ -1520,7 +1521,7 @@ declare namespace API {
   type UpdateOrderStatusRequest = {
     id: number;
     status: number;
-    method?: string;
+    payment_id?: number;
     trade_no?: string;
   };
 

apps/admin/services/common/index.ts

@@ -1,5 +1,5 @@
 // @ts-ignore
-
+ 
 // API 更新时间：
 // API 唯一标识：
 import * as auth from './auth';

apps/admin/services/common/typings.d.ts

@@ -195,7 +195,7 @@ declare namespace API {
   };
 
   type GetAvailablePaymentMethodsResponse = {
-    list: PaymenMethod[];
+    list: PaymentMethod[];
   };
 
   type GetGlobalConfigResponse = {
@@ -328,7 +328,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
-    method: string;
+    payment: PaymentMethod;
     fee_amount: number;
     trade_no: string;
     status: number;
@@ -350,6 +350,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
+    payment: PaymentMethod;
     method: string;
     fee_amount: number;
     trade_no: string;
@@ -360,17 +361,6 @@ declare namespace API {
     updated_at: number;
   };
 
-  type PaymenMethod = {
-    id: number;
-    name: string;
-    platform: string;
-    description: string;
-    icon: string;
-    fee_mode: number;
-    fee_percent: number;
-    fee_amount: number;
-  };
-
   type PaymentConfig = {
     id: number;
     name: string;
@@ -385,6 +375,17 @@ declare namespace API {
     enable: boolean;
   };
 
+  type PaymentMethod = {
+    id: number;
+    name: string;
+    platform: string;
+    description: string;
+    icon: string;
+    fee_mode: number;
+    fee_percent: number;
+    fee_amount: number;
+  };
+
   type PaymentMethodDetail = {
     id: number;
     name: string;