🐛 fix(changelog): Update change log style

apps/user/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/user/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;
   };

apps/user/services/user/index.ts

@@ -1,11 +1,12 @@
 // @ts-ignore
-/* eslint-disable */
+
 // API 更新时间：
 // API 唯一标识：
 import * as announcement from './announcement';
 import * as document from './document';
 import * as order from './order';
 import * as payment from './payment';
+import * as portal from './portal';
 import * as subscribe from './subscribe';
 import * as ticket from './ticket';
 import * as user from './user';
@@ -14,6 +15,7 @@ export default {
   document,
   order,
   payment,
+  portal,
   subscribe,
   ticket,
   user,

apps/user/services/user/order.ts

@@ -2,21 +2,6 @@
 /* eslint-disable */
 import request from '@/utils/request';
 
-/** Checkout order POST /v1/public/order/checkout */
-export async function checkoutOrder(
-  body: API.CheckoutOrderRequest,
-  options?: { [key: string]: any },
-) {
-  return request<API.Response & { data?: API.CheckoutOrderResponse }>('/v1/public/order/checkout', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
-
 /** Close order POST /v1/public/order/close */
 export async function closeOrder(body: API.CloseOrderRequest, options?: { [key: string]: any }) {
   return request<API.Response & { data?: any }>('/v1/public/order/close', {

apps/user/services/user/portal.ts

@@ -0,0 +1,91 @@
+// @ts-ignore
+/* eslint-disable */
+import request from '@/utils/request';
+
+/** Purchase Checkout POST /v1/public/portal/order/checkout */
+export async function purchaseCheckout(
+  body: API.CheckoutOrderRequest,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.CheckoutOrderResponse }>(
+    '/v1/public/portal/order/checkout',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data: body,
+      ...(options || {}),
+    },
+  );
+}
+
+/** Query Purchase Order GET /v1/public/portal/order/status */
+export async function queryPurchaseOrder(
+  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
+  params: API.QueryPurchaseOrderParams,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.QueryPurchaseOrderResponse }>(
+    '/v1/public/portal/order/status',
+    {
+      method: 'GET',
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    },
+  );
+}
+
+/** Get available payment methods GET /v1/public/portal/payment-method */
+export async function getAvailablePaymentMethods(options?: { [key: string]: any }) {
+  return request<API.Response & { data?: API.GetAvailablePaymentMethodsResponse }>(
+    '/v1/public/portal/payment-method',
+    {
+      method: 'GET',
+      ...(options || {}),
+    },
+  );
+}
+
+/** Pre Purchase Order POST /v1/public/portal/pre */
+export async function prePurchaseOrder(
+  body: API.PrePurchaseOrderRequest,
+  options?: { [key: string]: any },
+) {
+  return request<API.Response & { data?: API.PrePurchaseOrderResponse }>('/v1/public/portal/pre', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** Purchase subscription POST /v1/public/portal/purchase */
+export async function purchase(body: API.PortalPurchaseRequest, options?: { [key: string]: any }) {
+  return request<API.Response & { data?: API.PortalPurchaseResponse }>(
+    '/v1/public/portal/purchase',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data: body,
+      ...(options || {}),
+    },
+  );
+}
+
+/** Get Subscription GET /v1/public/portal/subscribe */
+export async function getSubscription(options?: { [key: string]: any }) {
+  return request<API.Response & { data?: API.GetSubscriptionResponse }>(
+    '/v1/public/portal/subscribe',
+    {
+      method: 'GET',
+      ...(options || {}),
+    },
+  );
+}

apps/user/services/user/typings.d.ts

@@ -13,6 +13,10 @@ declare namespace API {
     updated_at: number;
   };
 
+  type AlipayNotifyResponse = {
+    return_code: string;
+  };
+
   type Announcement = {
     id: number;
     title: string;
@@ -177,6 +181,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;
@@ -187,7 +204,7 @@ declare namespace API {
   };
 
   type GetAvailablePaymentMethodsResponse = {
-    list: PaymentConfig[];
+    list: PaymentMethod[];
   };
 
   type GetLoginLogParams = {
@@ -224,6 +241,24 @@ declare namespace API {
     total: number;
   };
 
+  type GetSubscriptionResponse = {
+    list: Subscribe[];
+  };
+
+  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 GetUserTicketDetailRequest = {
     id: number;
   };
@@ -319,7 +354,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
-    method: string;
+    payment: PaymentMethod;
     fee_amount: number;
     trade_no: string;
     status: number;
@@ -341,6 +376,7 @@ declare namespace API {
     coupon: string;
     coupon_discount: number;
     commission?: number;
+    payment: PaymentMethod;
     method: string;
     fee_amount: number;
     trade_no: string;
@@ -354,7 +390,8 @@ declare namespace API {
   type PaymentConfig = {
     id: number;
     name: string;
-    mark: string;
+    platform: string;
+    description: string;
     icon?: string;
     domain?: string;
     config: Record<string, any>;
@@ -364,6 +401,57 @@ 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 PortalPurchaseRequest = {
+    identifier: string;
+    platform: string;
+    password?: string;
+    payment: number;
+    subscribe_id: number;
+    quantity: number;
+    coupon?: string;
+    turnstile_token?: string;
+  };
+
+  type PortalPurchaseResponse = {
+    order_no: string;
+  };
+
   type PreOrderResponse = {
     price: number;
     amount: number;
@@ -374,6 +462,22 @@ declare namespace API {
     fee_amount: number;
   };
 
+  type PrePurchaseOrderRequest = {
+    payment: number;
+    subscribe_id: number;
+    quantity: number;
+    coupon?: string;
+  };
+
+  type PrePurchaseOrderResponse = {
+    price: number;
+    amount: number;
+    discount: number;
+    coupon: string;
+    coupon_discount: number;
+    fee_amount: number;
+  };
+
   type PreRenewalOrderResponse = {
     orderNo: string;
   };
@@ -404,7 +508,7 @@ declare namespace API {
   type PurchaseOrderRequest = {
     subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -467,6 +571,30 @@ declare namespace API {
     list: OrderDetail[];
   };
 
+  type QueryPurchaseOrderParams = {
+    order_no: string;
+  };
+
+  type QueryPurchaseOrderRequest = {
+    order_no: string;
+  };
+
+  type QueryPurchaseOrderResponse = {
+    order_no: string;
+    subscribe: Subscribe;
+    quantity: number;
+    price: number;
+    amount: number;
+    discount: number;
+    coupon: string;
+    coupon_discount: number;
+    fee_amount: number;
+    payment: PaymentMethod;
+    status: number;
+    created_at: number;
+    token?: string;
+  };
+
   type QuerySubscribeGroupListResponse = {
     list: SubscribeGroup[];
     total: number;
@@ -524,7 +652,7 @@ declare namespace API {
 
   type RechargeOrderRequest = {
     amount: number;
-    payment: string;
+    payment: number;
   };
 
   type RechargeOrderResponse = {
@@ -545,7 +673,7 @@ declare namespace API {
   type RenewalOrderRequest = {
     user_subscribe_id: number;
     quantity: number;
-    payment: string;
+    payment: number;
     coupon?: string;
   };
 
@@ -555,7 +683,7 @@ declare namespace API {
 
   type ResetTrafficOrderRequest = {
     user_subscribe_id: number;
-    payment: string;
+    payment: number;
   };
 
   type ResetTrafficOrderResponse = {
@@ -824,8 +952,8 @@ declare namespace API {
   };
 
   type UserAffiliate = {
-    email: string;
     avatar: string;
+    identifier: string;
     registered_at: number;
     enable: boolean;
   };