🐛 fix(changelog): Update change log style

apps/admin/services/admin/payment.ts

@@ -2,20 +2,12 @@
 /* eslint-disable */
 import request from '@/utils/request';
 
-/** Get alipay f2f payment config GET /v1/admin/payment/alipay_f2f */
-export async function getAlipayF2FPaymentConfig(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.PaymentConfig }>('/v1/admin/payment/alipay_f2f', {
-    method: 'GET',
-    ...(options || {}),
-  });
-}
-
-/** Update alipay f2f payment config PUT /v1/admin/payment/alipay_f2f */
-export async function updateAlipayF2FPaymentConfig(
-  body: API.UpdateAlipayF2fRequest,
+/** Update Payment Method PUT /v1/admin/payment/ */
+export async function updatePaymentMethod(
+  body: API.UpdatePaymentMethodRequest,
   options?: { [key: string]: any },
 ) {
-  return request<API.Response & { data?: any }>('/v1/admin/payment/alipay_f2f', {
+  return request<API.Response & { data?: API.PaymentConfig }>('/v1/admin/payment/', {
     method: 'PUT',
     headers: {
       'Content-Type': 'application/json',
@@ -25,85 +17,58 @@ export async function updateAlipayF2FPaymentConfig(
   });
 }
 
-/** Get all payment config GET /v1/admin/payment/all */
-export async function getAllPaymentConfig(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.GetAllPaymentConfigResponse }>(
-    '/v1/admin/payment/all',
+/** Create Payment Method POST /v1/admin/payment/ */
+export async function createPaymentMethod(
+  body: API.CreatePaymentMethodRequest,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.PaymentConfig }>('/v1/admin/payment/', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** Delete Payment Method DELETE /v1/admin/payment/ */
+export async function deletePaymentMethod(
+  body: API.DeletePaymentMethodRequest,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: any }>('/v1/admin/payment/', {
+    method: 'DELETE',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** Get Payment Method List GET /v1/admin/payment/list */
+export async function getPaymentMethodList(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.GetPaymentMethodListParams,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.GetPaymentMethodListResponse }>(
+    '/v1/admin/payment/list',
     {
       method: 'GET',
+      params: {
+        ...params,
+      },
       ...(options || {}),
     },
   );
 }
 
-/** Get epay payment config GET /v1/admin/payment/epay */
-export async function getEpayPaymentConfig(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.PaymentConfig }>('/v1/admin/payment/epay', {
+/** Get supported payment platform GET /v1/admin/payment/platform */
+export async function getPaymentPlatform(options?: { [key: string]: any }) {
+  return request<API.Response & { data?: API.PlatformResponse }>('/v1/admin/payment/platform', {
     method: 'GET',
     ...(options || {}),
   });
 }
-
-/** Update epay payment config PUT /v1/admin/payment/epay */
-export async function updateEpayPaymentConfig(
-  body: API.UpdateEpayRequest,
-  options?: { [key: string]: any },
-) {
-  return request<API.Response & { data?: any }>('/v1/admin/payment/epay', {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Get stripe alipay payment config GET /v1/admin/payment/stripe_alipay */
-export async function getStripeAlipayPaymentConfig(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.PaymentConfig }>('/v1/admin/payment/stripe_alipay', {
-    method: 'GET',
-    ...(options || {}),
-  });
-}
-
-/** Update stripe alipay payment config PUT /v1/admin/payment/stripe_alipay */
-export async function updateStripeAlipayPaymentConfig(
-  body: API.UpdateStripeRequest,
-  options?: { [key: string]: any },
-) {
-  return request<API.Response & { data?: any }>('/v1/admin/payment/stripe_alipay', {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
-/** Get stripe wechat pay payment config GET /v1/admin/payment/stripe_wechat_pay */
-export async function getStripeWeChatPayPaymentConfig(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.PaymentConfig }>(
-    '/v1/admin/payment/stripe_wechat_pay',
-    {
-      method: 'GET',
-      ...(options || {}),
-    },
-  );
-}
-
-/** Update stripe wechat pay payment config PUT /v1/admin/payment/stripe_wechat_pay */
-export async function updateStripeWeChatPayPaymentConfig(
-  body: API.UpdateStripeRequest,
-  options?: { [key: string]: any },
-) {
-  return request<API.Response & { data?: any }>('/v1/admin/payment/stripe_wechat_pay', {
-    method: 'PUT',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}

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

@@ -13,12 +13,8 @@ declare namespace API {
     updated_at: number;
   };
 
-  type AlipayF2FConfig = {
-    app_id: string;
-    private_key: string;
-    public_key: string;
-    invoice_name: string;
-    sandbox: boolean;
+  type AlipayNotifyResponse = {
+    return_code: string;
   };
 
   type Announcement = {
@@ -120,17 +116,6 @@ declare namespace API {
     ids: number[];
   };
 
-  type CheckoutOrderRequest = {
-    orderNo: string;
-    returnUrl?: string;
-  };
-
-  type CheckoutOrderResponse = {
-    type: string;
-    checkout_url?: string;
-    stripe?: StripePayment;
-  };
-
   type CloseOrderRequest = {
     orderNo: string;
   };
@@ -239,12 +224,25 @@ declare namespace API {
     coupon_discount?: number;
     commission: number;
     fee_amount: number;
-    method?: string;
+    payment_id: number;
     trade_no?: string;
     status?: number;
     subscribe_id?: number;
   };
 
+  type CreatePaymentMethodRequest = {
+    name: string;
+    platform: string;
+    description: string;
+    icon?: string;
+    domain?: string;
+    config: Record<string, any>;
+    fee_mode: number;
+    fee_percent?: number;
+    fee_amount?: number;
+    enable: boolean;
+  };
+
   type CreateRuleGroupRequest = {
     name: string;
     icon: string;
@@ -352,6 +350,10 @@ declare namespace API {
     id: number;
   };
 
+  type DeletePaymentMethodRequest = {
+    id: number;
+  };
+
   type DeleteRuleGroupRequest = {
     id: number;
   };
@@ -398,10 +400,17 @@ declare namespace API {
     domain_suffix_list: string;
   };
 
-  type EpayConfig = {
-    pid: string;
-    url: string;
-    key: string;
+  type EPayNotifyRequest = {
+    pid: number;
+    trade_no: string;
+    out_trade_no: string;
+    type: string;
+    name: string;
+    money: string;
+    trade_status: string;
+    param: string;
+    sign: string;
+    sign_type: string;
   };
 
   type Follow = {
@@ -440,10 +449,6 @@ declare namespace API {
     list: Ads[];
   };
 
-  type GetAllPaymentConfigResponse = {
-    list: PaymentConfig[];
-  };
-
   type GetAnnouncementListParams = {
     page: number;
     size: number;
@@ -488,7 +493,7 @@ declare namespace API {
   };
 
   type GetAvailablePaymentMethodsResponse = {
-    list: PaymentConfig[];
+    list: PaymentMethod[];
   };
 
   type GetCouponListParams = {
@@ -625,6 +630,27 @@ declare namespace API {
     list: Order[];
   };
 
+  type GetPaymentMethodListParams = {
+    page: number;
+    size: number;
+    platform?: string;
+    search?: string;
+    enable?: boolean;
+  };
+
+  type GetPaymentMethodListRequest = {
+    page: number;
+    size: number;
+    platform?: string;
+    search?: string;
+    enable?: boolean;
+  };
+
+  type GetPaymentMethodListResponse = {
+    total: number;
+    list: PaymentMethodDetail[];
+  };
+
   type GetRuleGroupResponse = {
     total: number;
     list: ServerRuleGroup[];
@@ -797,6 +823,8 @@ declare namespace API {
     size: number;
     user_id: number;
     subscribe_id: number;
+    start_time: number;
+    end_time: number;
   };
 
   type GetUserSubscribeTrafficLogsRequest = {
@@ -804,6 +832,8 @@ declare namespace API {
     size: number;
     user_id: number;
     subscribe_id: number;
+    start_time: number;
+    end_time: number;
   };
 
   type GetUserSubscribeTrafficLogsResponse = {
@@ -891,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;
@@ -913,6 +943,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
+    payment: PaymentMethod;
     method: string;
     fee_amount: number;
     trade_no: string;
@@ -934,7 +965,8 @@ declare namespace API {
   type PaymentConfig = {
     id: number;
     name: string;
-    mark: string;
+    platform: string;
+    description: string;
     icon?: string;
     domain?: string;
     config: Record<string, any>;
@@ -944,6 +976,32 @@ 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;
+    platform: string;
+    description: string;
+    icon: string;
+    domain: string;
+    config: Record<string, any>;
+    fee_mode: number;
+    fee_percent: number;
+    fee_amount: number;
+    enable: boolean;
+    notify_url: string;
+  };
+
   type PlatformInfo = {
     platform: string;
     platform_url: string;
@@ -986,7 +1044,7 @@ declare namespace API {
   type PurchaseOrderRequest = {
     subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -1029,9 +1087,24 @@ declare namespace API {
     list: OrderDetail[];
   };
 
+  type QuerySubscribeGroupListResponse = {
+    list: SubscribeGroup[];
+    total: number;
+  };
+
+  type QuerySubscribeListResponse = {
+    list: Subscribe[];
+    total: number;
+  };
+
+  type QueryUserAffiliateListResponse = {
+    list: UserAffiliate[];
+    total: number;
+  };
+
   type RechargeOrderRequest = {
     amount: number;
-    payment: string;
+    payment: number;
   };
 
   type RechargeOrderResponse = {
@@ -1052,7 +1125,7 @@ declare namespace API {
   type RenewalOrderRequest = {
     user_subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -1062,7 +1135,7 @@ declare namespace API {
 
   type ResetTrafficOrderRequest = {
     user_subscribe_id: number;
-    payment: string;
+    payment: number;
   };
 
   type ResetTrafficOrderResponse = {
@@ -1187,13 +1260,6 @@ declare namespace API {
     sort: number;
   };
 
-  type StripeConfig = {
-    public_key: string;
-    secret_key: string;
-    webhook_secret: string;
-    payment: string;
-  };
-
   type StripePayment = {
     method: string;
     client_secret: string;
@@ -1365,19 +1431,6 @@ declare namespace API {
     status: number;
   };
 
-  type UpdateAlipayF2fRequest = {
-    id: number;
-    name: string;
-    mark: string;
-    icon?: string;
-    domain?: string;
-    config: AlipayF2FConfig;
-    fee_mode: number;
-    fee_percent?: number;
-    fee_amount?: number;
-    enable: boolean;
-  };
-
   type UpdateAnnouncementEnableRequest = {
     id: number;
     enable: boolean;
@@ -1441,19 +1494,6 @@ declare namespace API {
     show: boolean;
   };
 
-  type UpdateEpayRequest = {
-    id: number;
-    name: string;
-    mark: string;
-    icon?: string;
-    domain?: string;
-    config: EpayConfig;
-    fee_mode: number;
-    fee_percent?: number;
-    fee_amount?: number;
-    enable: boolean;
-  };
-
   type UpdateNodeGroupRequest = {
     id: number;
     name: string;
@@ -1481,10 +1521,24 @@ declare namespace API {
   type UpdateOrderStatusRequest = {
     id: number;
     status: number;
-    method?: string;
+    payment_id?: number;
     trade_no?: string;
   };
 
+  type UpdatePaymentMethodRequest = {
+    id: number;
+    name: string;
+    platform: string;
+    description: string;
+    icon?: string;
+    domain?: string;
+    config: Record<string, any>;
+    fee_mode: number;
+    fee_percent?: number;
+    fee_amount?: number;
+    enable: boolean;
+  };
+
   type UpdateRuleGroupRequest = {
     id: number;
     name: string;
@@ -1493,19 +1547,6 @@ declare namespace API {
     enable: boolean;
   };
 
-  type UpdateStripeRequest = {
-    id: number;
-    name: string;
-    mark: string;
-    icon?: string;
-    domain?: string;
-    config: StripeConfig;
-    fee_mode: number;
-    fee_percent?: number;
-    fee_amount?: number;
-    enable: boolean;
-  };
-
   type UpdateSubscribeGroupRequest = {
     id: number;
     name: string;
@@ -1603,8 +1644,8 @@ declare namespace API {
   };
 
   type UserAffiliate = {
-    email: string;
     avatar: string;
+    identifier: string;
     registered_at: number;
     enable: boolean;
   };

apps/admin/services/common/common.ts

@@ -2,6 +2,21 @@
 /* eslint-disable */
 import request from '@/utils/request';
 
+/** Get Ads GET /v1/common/ads */
+export async function getAds(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.GetAdsParams,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.GetAdsResponse }>('/v1/common/ads', {
+    method: 'GET',
+    params: {
+      ...params,
+    },
+    ...(options || {}),
+  });
+}
+
 /** Get Tos Content GET /v1/common/application */
 export async function getApplication(options?: { [key: string]: any }) {
   return request<API.Response & { data?: API.GetAppcationResponse }>('/v1/common/application', {
@@ -58,17 +73,6 @@ export async function getStat(options?: { [key: string]: any }) {
   });
 }
 
-/** Get Subscription GET /v1/common/site/subscribe */
-export async function getSubscription(options?: { [key: string]: any }) {
-  return request<API.Response & { data?: API.GetSubscriptionResponse }>(
-    '/v1/common/site/subscribe',
-    {
-      method: 'GET',
-      ...(options || {}),
-    },
-  );
-}
-
 /** Get Tos Content GET /v1/common/site/tos */
 export async function getTos(options?: { [key: string]: any }) {
   return request<API.Response & { data?: API.GetTosResponse }>('/v1/common/site/tos', {

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

@@ -13,6 +13,10 @@ declare namespace API {
     updated_at: number;
   };
 
+  type AlipayNotifyResponse = {
+    return_code: string;
+  };
+
   type Announcement = {
     id: number;
     title: string;
@@ -90,17 +94,6 @@ declare namespace API {
     enabled: boolean;
   };
 
-  type CheckoutOrderRequest = {
-    orderNo: string;
-    returnUrl?: string;
-  };
-
-  type CheckoutOrderResponse = {
-    type: string;
-    checkout_url?: string;
-    stripe?: StripePayment;
-  };
-
   type CheckUserParams = {
     email: string;
   };
@@ -160,6 +153,19 @@ declare namespace API {
     domain_suffix_list: string;
   };
 
+  type EPayNotifyRequest = {
+    pid: number;
+    trade_no: string;
+    out_trade_no: string;
+    type: string;
+    name: string;
+    money: string;
+    trade_status: string;
+    param: string;
+    sign: string;
+    sign_type: string;
+  };
+
   type Follow = {
     id: number;
     ticket_id: number;
@@ -169,13 +175,27 @@ declare namespace API {
     created_at: number;
   };
 
+  type GetAdsParams = {
+    device: string;
+    position: string;
+  };
+
+  type GetAdsRequest = {
+    device: string;
+    position: string;
+  };
+
+  type GetAdsResponse = {
+    list: Ads[];
+  };
+
   type GetAppcationResponse = {
     config: ApplicationConfig;
     applications: ApplicationResponseInfo[];
   };
 
   type GetAvailablePaymentMethodsResponse = {
-    list: PaymentConfig[];
+    list: PaymentMethod[];
   };
 
   type GetGlobalConfigResponse = {
@@ -187,6 +207,7 @@ declare namespace API {
     subscribe: SubscribeConfig;
     verify_code: PubilcVerifyCodeConfig;
     oauth_methods: string[];
+    web_ad: boolean;
   };
 
   type GetStatResponse = {
@@ -196,14 +217,24 @@ declare namespace API {
     protocol: string[];
   };
 
-  type GetSubscriptionResponse = {
-    list: Subscribe[];
-  };
-
   type GetTosResponse = {
     tos_content: string;
   };
 
+  type GetUserSubscribeTrafficLogsRequest = {
+    page: number;
+    size: number;
+    user_id: number;
+    subscribe_id: number;
+    start_time: number;
+    end_time: number;
+  };
+
+  type GetUserSubscribeTrafficLogsResponse = {
+    list: TrafficLog[];
+    total: number;
+  };
+
   type GoogleLoginCallbackRequest = {
     code: string;
     state: string;
@@ -297,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;
@@ -319,6 +350,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
+    payment: PaymentMethod;
     method: string;
     fee_amount: number;
     trade_no: string;
@@ -332,7 +364,8 @@ declare namespace API {
   type PaymentConfig = {
     id: number;
     name: string;
-    mark: string;
+    platform: string;
+    description: string;
     icon?: string;
     domain?: string;
     config: Record<string, any>;
@@ -342,6 +375,42 @@ 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;
+    platform: string;
+    description: string;
+    icon: string;
+    domain: string;
+    config: Record<string, any>;
+    fee_mode: number;
+    fee_percent: number;
+    fee_amount: number;
+    enable: boolean;
+    notify_url: string;
+  };
+
+  type PlatformInfo = {
+    platform: string;
+    platform_url: string;
+    platform_field_description: Record<string, any>;
+  };
+
+  type PlatformResponse = {
+    list: PlatformInfo[];
+  };
+
   type PreOrderResponse = {
     price: number;
     amount: number;
@@ -374,7 +443,7 @@ declare namespace API {
   type PurchaseOrderRequest = {
     subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -417,9 +486,24 @@ declare namespace API {
     list: OrderDetail[];
   };
 
+  type QuerySubscribeGroupListResponse = {
+    list: SubscribeGroup[];
+    total: number;
+  };
+
+  type QuerySubscribeListResponse = {
+    list: Subscribe[];
+    total: number;
+  };
+
+  type QueryUserAffiliateListResponse = {
+    list: UserAffiliate[];
+    total: number;
+  };
+
   type RechargeOrderRequest = {
     amount: number;
-    payment: string;
+    payment: number;
   };
 
   type RechargeOrderResponse = {
@@ -440,7 +524,7 @@ declare namespace API {
   type RenewalOrderRequest = {
     user_subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -457,7 +541,7 @@ declare namespace API {
 
   type ResetTrafficOrderRequest = {
     user_subscribe_id: number;
-    payment: string;
+    payment: number;
   };
 
   type ResetTrafficOrderResponse = {
@@ -737,8 +821,8 @@ declare namespace API {
   };
 
   type UserAffiliate = {
-    email: string;
     avatar: string;
+    identifier: string;
     registered_at: number;
     enable: boolean;
   };