Revert "sub plan page (#885)" (#886)

This reverts commit 443ad37b6a.

packages/global/support/openapi/type.d.ts

@@ -1,5 +1,6 @@
 export type OpenApiSchema = {
   _id: string;
+  userId: string;
   teamId: string;
   tmbId: string;
   createTime: Date;
@@ -7,9 +8,9 @@ export type OpenApiSchema = {
   apiKey: string;
   appId?: string;
   name: string;
-  usagePoints: number;
+  usage: number;
   limit?: {
     expiredTime?: Date;
-    maxUsagePoints: number;
+    credit?: number;
   };
 };

packages/global/support/outLink/api.d.ts

@@ -1,5 +1,5 @@
 import type { HistoryItemType, ChatSiteItemType } from '../../core/chat/type.d';
-import { OutLinkSchema } from './type.d';
+import { OutLinkSchema } from '@fastgpt/global/support/outLink/type';
 
 export type AuthOutLinkInitProps = {
   outLinkUid: string;

packages/global/support/outLink/type.d.ts

@@ -7,14 +7,14 @@ export type OutLinkSchema = {
   tmbId: string;
   appId: string;
   name: string;
-  usagePoints: number;
+  total: number;
   lastTime: Date;
   type: `${OutLinkTypeEnum}`;
   responseDetail: boolean;
   limit?: {
     expiredTime?: Date;
     QPM: number;
-    maxUsagePoints: number;
+    credit: number;
     hookUrl?: string;
   };
 };

packages/global/support/permission/type.d.ts

@@ -1,6 +1,7 @@
 import { AuthUserTypeEnum } from './constant';
 
 export type AuthResponseType = {
+  userId: string;
   teamId: string;
   tmbId: string;
   isOwner: boolean;

packages/global/support/user/team/constant.ts

@@ -1,6 +1,5 @@
 export const TeamCollectionName = 'teams';
 export const TeamMemberCollectionName = 'team.members';
-export const TeamTagsCollectionName = 'team.tags';
 
 export enum TeamMemberRoleEnum {
   owner = 'owner',

packages/global/support/user/team/controller.d.ts

@@ -15,7 +15,6 @@ export type UpdateTeamProps = {
   teamId: string;
   name?: string;
   avatar?: string;
-  tagsUrl?: string;
 };
 
 /* ------------- member ----------- */

packages/global/support/user/team/type.d.ts

@@ -9,23 +9,11 @@ export type TeamSchema = {
   createTime: Date;
   balance: number;
   maxSize: number;
-  tagsUrl: string;
   limit: {
     lastExportDatasetTime: Date;
     lastWebsiteSyncTime: Date;
   };
 };
-export type tagsType = {
-  label: string,
-  key: string
-}
-export type TeamTagsSchema = {
-  _id: string;
-  label: string;
-  teamId: string;
-  key: string;
-  createTime: Date;
-};
 
 export type TeamMemberSchema = {
   _id: string;
@@ -38,13 +26,13 @@ export type TeamMemberSchema = {
   defaultTeam: boolean;
 };
 
-export type TeamMemberWithUserSchema = Omit<TeamMemberSchema, 'userId'> & {
+export type TeamMemberWithUserSchema = TeamMemberSchema & {
   userId: UserModelSchema;
 };
-export type TeamMemberWithTeamSchema = Omit<TeamMemberSchema, 'teamId'> & {
+export type TeamMemberWithTeamSchema = TeamMemberSchema & {
   teamId: TeamSchema;
 };
-export type TeamMemberWithTeamAndUserSchema = Omit<TeamMemberWithTeamSchema, 'userId'> & {
+export type TeamMemberWithTeamAndUserSchema = TeamMemberWithTeamSchema & {
   userId: UserModelSchema;
 };
 

packages/global/support/user/type.d.ts

@@ -29,5 +29,4 @@ export type UserType = {
   promotionRate: UserModelSchema['promotionRate'];
   openaiAccount: UserModelSchema['openaiAccount'];
   team: TeamItemType;
-  standardInfo?: standardInfoType;
 };

packages/global/support/wallet/bill/api.d.ts

@@ -1,18 +1,25 @@
-import { BillTypeEnum } from './constants';
+import { BillSourceEnum } from './constants';
+import { BillListItemCountType, BillListItemType } from './type';
+
+export type CreateTrainingBillProps = {
+  name: string;
+  datasetId: string;
+};
+
+export type ConcatBillProps = BillListItemCountType & {
+  teamId: string;
+  tmbId: string;
+  billId?: string;
+  total: number;
+  listIndex?: number;
+};
 
 export type CreateBillProps = {
-  type: `${BillTypeEnum}`;
-
-  // balance
-  balance?: number; // read
-
-  month?: number;
-  // extra dataset size
-  extraDatasetSize?: number; // 1k
-  extraPoints?: number; // 100w
-};
-export type CreateBillResponse = {
-  billId: string;
-  codeUrl: string;
-  readPrice: number;
+  teamId: string;
+  tmbId: string;
+  appName: string;
+  appId?: string;
+  total: number;
+  source: `${BillSourceEnum}`;
+  list: BillListItemType[];
 };

packages/global/support/wallet/bill/constants.ts

@@ -1,57 +1,34 @@
-export enum BillTypeEnum {
-  balance = 'balance',
+// model price: xxx/1k tokens
+// ￥1 = 100000.
+export const PRICE_SCALE = 100000;
+
+export enum BillSourceEnum {
+  fastgpt = 'fastgpt',
+  api = 'api',
+  shareLink = 'shareLink',
+  training = 'training',
+
   standSubPlan = 'standSubPlan',
-  extraDatasetSub = 'extraDatasetSub',
-  extraPoints = 'extraPoints'
+  extraDatasetSub = 'extraDatasetSub'
 }
-export const billTypeMap = {
-  [BillTypeEnum.balance]: {
-    label: 'support.wallet.subscription.type.balance'
+
+export const BillSourceMap = {
+  [BillSourceEnum.fastgpt]: {
+    label: '在线使用'
   },
-  [BillTypeEnum.standSubPlan]: {
+  [BillSourceEnum.api]: {
+    label: 'Api'
+  },
+  [BillSourceEnum.shareLink]: {
+    label: '免登录链接'
+  },
+  [BillSourceEnum.training]: {
+    label: 'dataset.Training Name'
+  },
+  [BillSourceEnum.standSubPlan]: {
     label: 'support.wallet.subscription.type.standard'
   },
-  [BillTypeEnum.extraDatasetSub]: {
+  [BillSourceEnum.extraDatasetSub]: {
     label: 'support.wallet.subscription.type.extraDatasetSize'
-  },
-  [BillTypeEnum.extraPoints]: {
-    label: 'support.wallet.subscription.type.extraPoints'
   }
 };
-
-export enum BillStatusEnum {
-  SUCCESS = 'SUCCESS',
-  REFUND = 'REFUND',
-  NOTPAY = 'NOTPAY',
-  CLOSED = 'CLOSED'
-}
-export const billStatusMap = {
-  [BillStatusEnum.SUCCESS]: {
-    label: 'support.wallet.bill.status.success'
-  },
-  [BillStatusEnum.REFUND]: {
-    label: 'support.wallet.bill.status.refund'
-  },
-  [BillStatusEnum.NOTPAY]: {
-    label: 'support.wallet.bill.status.notpay'
-  },
-  [BillStatusEnum.CLOSED]: {
-    label: 'support.wallet.bill.status.closed'
-  }
-};
-
-export enum BillPayWayEnum {
-  balance = 'balance',
-  wx = 'wx'
-}
-export const billPayWayMap = {
-  [BillPayWayEnum.balance]: {
-    label: 'support.wallet.bill.payWay.balance'
-  },
-  [BillPayWayEnum.wx]: {
-    label: 'support.wallet.bill.payWay.wx'
-  }
-};
-
-export const SUB_DATASET_SIZE_RATE = 1000;
-export const SUB_EXTRA_POINT_RATE = 1000000;

packages/global/support/wallet/bill/tools.ts

@@ -0,0 +1,26 @@
+/* bill common  */
+import { PRICE_SCALE } from './constants';
+import { BillSourceEnum } from './constants';
+import { AuthUserTypeEnum } from '../../permission/constant';
+
+/**
+ * dataset price / PRICE_SCALE = real price
+ */
+export const formatStorePrice2Read = (val = 0, multiple = 1) => {
+  return Number(((val / PRICE_SCALE) * multiple).toFixed(10));
+};
+export const formatModelPrice2Read = (val = 0) => {
+  return Number((val / 1000).toFixed(10));
+};
+
+export const getBillSourceByAuthType = ({
+  shareId,
+  authType
+}: {
+  shareId?: string;
+  authType?: `${AuthUserTypeEnum}`;
+}) => {
+  if (shareId) return BillSourceEnum.shareLink;
+  if (authType === AuthUserTypeEnum.apikey) return BillSourceEnum.api;
+  return BillSourceEnum.fastgpt;
+};

packages/global/support/wallet/bill/type.d.ts

@@ -1,29 +1,35 @@
-import { StandardSubLevelEnum, SubModeEnum, SubTypeEnum } from '../sub/constants';
-import { BillPayWayEnum, BillTypeEnum } from './constants';
+import { CreateBillProps } from './api';
+import { BillSourceEnum } from './constants';
 
-export type BillSchemaType = {
-  _id: string;
-  userId: string;
-  teamId: string;
-  tmbId: string;
-  createTime: Date;
-  orderId: string;
-  status: 'SUCCESS' | 'REFUND' | 'NOTPAY' | 'CLOSED';
-  type: `${BillTypeEnum}`;
-  price: number;
-  metadata: {
-    payWay: `${BillPayWayEnum}`;
-    subMode?: `${SubModeEnum}`;
-    standSubLevel?: `${StandardSubLevelEnum}`;
-    month?: number;
-    datasetSize?: number;
-    extraPoints?: number;
-  };
+export type BillListItemCountType = {
+  inputTokens?: number;
+  outputTokens?: number;
+  charsLength?: number;
+  duration?: number;
+
+  // sub
+  datasetSize?: number;
+
+  // abandon
+  tokenLen?: number;
 };
-
-export type ChatModuleBillType = {
-  totalPoints: number;
+export type BillListItemType = BillListItemCountType & {
   moduleName: string;
-  model: string;
-  charsLength: number;
+  amount: number;
+  model?: string;
+};
+
+export type BillSchema = CreateBillProps & {
+  _id: string;
+  time: Date;
+};
+
+export type BillItemType = {
+  id: string;
+  // memberName: string;
+  time: Date;
+  appName: string;
+  source: BillSchema['source'];
+  total: number;
+  list: BillSchema['list'];
 };

packages/global/support/wallet/constants.ts

@@ -1,3 +0,0 @@
-// model price: xxx/1k tokens
-// ￥1 = 100000.
-export const PRICE_SCALE = 100000;

packages/global/support/wallet/pay/constants.ts

@@ -0,0 +1,41 @@
+export enum PayTypeEnum {
+  balance = 'balance',
+  subStandard = 'subStandard',
+  subExtraDatasetSize = 'subExtraDatasetSize',
+  subExtraPoints = 'subExtraPoints'
+}
+export const payTypeMap = {
+  [PayTypeEnum.balance]: {
+    label: 'support.user.team.pay.type.balance'
+  },
+  [PayTypeEnum.subStandard]: {
+    label: 'support.wallet.subscription.type.standard'
+  },
+  [PayTypeEnum.subExtraDatasetSize]: {
+    label: 'support.wallet.subscription.type.extraDatasetSize'
+  },
+  [PayTypeEnum.subExtraPoints]: {
+    label: 'support.wallet.subscription.type.extraPoints'
+  }
+};
+
+export enum PayStatusEnum {
+  SUCCESS = 'SUCCESS',
+  REFUND = 'REFUND',
+  NOTPAY = 'NOTPAY',
+  CLOSED = 'CLOSED'
+}
+export const payStatusMap = {
+  [PayStatusEnum.SUCCESS]: {
+    label: 'support.user.team.pay.status.success'
+  },
+  [PayStatusEnum.REFUND]: {
+    label: 'support.user.team.pay.status.refund'
+  },
+  [PayStatusEnum.NOTPAY]: {
+    label: 'support.user.team.pay.status.notpay'
+  },
+  [PayStatusEnum.CLOSED]: {
+    label: 'support.user.team.pay.status.closed'
+  }
+};

packages/global/support/wallet/pay/type.d.ts

@@ -0,0 +1,18 @@
+import { SubModeEnum, SubTypeEnum } from '../sub/constants';
+import { PayTypeEnum } from './constants';
+
+export type PaySchema = {
+  _id: string;
+  userId: string;
+  teamId: string;
+  tmbId: string;
+  createTime: Date;
+  orderId: string;
+  status: 'SUCCESS' | 'REFUND' | 'NOTPAY' | 'CLOSED';
+  type: `${PayType}`;
+
+  price: number;
+  payWay: 'balance' | 'wx';
+
+  subMetadata: {};
+};

packages/global/support/wallet/sub/api.d.ts

@@ -1,14 +1,26 @@
 import { StandardSubLevelEnum, SubModeEnum } from './constants';
 import { TeamSubSchema } from './type.d';
 
+export type SubDatasetSizeParams = {
+  size: number;
+};
 export type StandardSubPlanParams = {
   level: `${StandardSubLevelEnum}`;
   mode: `${SubModeEnum}`;
 };
 
+export type SubDatasetSizePreviewCheckResponse = {
+  payForNewSub: boolean; // Does this change require payment
+  newSubSize: number; // new sub dataset size
+  alreadySubSize: number; // old sub dataset size
+  payPrice: number; // this change require payment
+  newPlanPrice: number; // the new sub price
+  newSubStartTime: Date;
+  newSubExpiredTime: Date;
+  balanceEnough: boolean; // team balance is enough
+};
 export type StandardSubPlanUpdateResponse = {
   balanceEnough: boolean; // team balance is enough
-  teamBalance: number;
   payPrice?: number;
   planPrice: number;
   planPointPrice: number;

packages/global/support/wallet/sub/constants.ts

@@ -1,3 +1,5 @@
+export const POINTS_SCALE = 10000;
+
 export enum SubTypeEnum {
   standard = 'standard',
   extraDatasetSize = 'extraDatasetSize',
@@ -17,16 +19,20 @@ export const subTypeMap = {
 
 export enum SubStatusEnum {
   active = 'active',
-  expired = 'expired'
+  canceled = 'canceled'
 }
 export const subStatusMap = {
   [SubStatusEnum.active]: {
     label: 'support.wallet.subscription.status.active'
   },
-  [SubStatusEnum.expired]: {
+  [SubStatusEnum.canceled]: {
     label: 'support.wallet.subscription.status.canceled'
   }
 };
+export const subSelectMap = {
+  true: SubStatusEnum.active,
+  false: SubStatusEnum.canceled
+};
 
 export enum SubModeEnum {
   month = 'month',
@@ -34,11 +40,11 @@ export enum SubModeEnum {
 }
 export const subModeMap = {
   [SubModeEnum.month]: {
-    label: 'support.wallet.subscription.mode.Month',
+    label: 'support.wallet.subscription.mode.month',
     durationMonth: 1
   },
   [SubModeEnum.year]: {
-    label: 'support.wallet.subscription.mode.Year',
+    label: 'support.wallet.subscription.mode.year',
     durationMonth: 12
   }
 };
@@ -57,7 +63,7 @@ export const standardSubLevelMap = {
   },
   [StandardSubLevelEnum.experience]: {
     label: 'support.wallet.subscription.standardSubLevel.experience',
-    desc: ''
+    desc: 'support.wallet.subscription.standardSubLevel.experience desc'
   },
   [StandardSubLevelEnum.team]: {
     label: 'support.wallet.subscription.standardSubLevel.team',

packages/global/support/wallet/sub/type.d.ts

@@ -2,19 +2,19 @@ import { StandardSubLevelEnum, SubModeEnum, SubStatusEnum, SubTypeEnum } from '.
 
 // Content of plan
 export type TeamStandardSubPlanItemType = {
-  price: number; // read price / month
-  pointPrice: number; // read price/ one thousand
-  totalPoints: number; // n
+  price: number; // read price
+  pointPrice: number; // read price/ one ten thousand
   maxTeamMember: number;
   maxAppAmount: number; // max app or plugin amount
   maxDatasetAmount: number;
   chatHistoryStoreDuration: number; // n day
   maxDatasetSize: number;
+  customApiKey: boolean;
+  customCopyright: boolean; // feature
+  websiteSyncInterval: number; // n hours
   trainingWeight: number; // 1~4
-  permissionCustomApiKey: boolean;
-  permissionCustomCopyright: boolean; // feature
-  permissionWebsiteSync: boolean;
-  permissionReRank: boolean;
+  reRankWeight: number; // 1~4
+  totalPoints: number; // n ten thousand
 };
 
 export type StandSubPlanLevelMapType = Record<
@@ -27,9 +27,6 @@ export type SubPlanType = {
   [SubTypeEnum.extraDatasetSize]: {
     price: number;
   };
-  [SubTypeEnum.extraPoints]: {
-    price: number;
-  };
 };
 
 export type TeamSubSchema = {
@@ -37,32 +34,40 @@ export type TeamSubSchema = {
   teamId: string;
   type: `${SubTypeEnum}`;
   status: `${SubStatusEnum}`;
+  currentMode: `${SubModeEnum}`;
+  nextMode: `${SubModeEnum}`;
   startTime: Date;
   expiredTime: Date;
   price: number;
 
-  currentMode: `${SubModeEnum}`;
-  nextMode: `${SubModeEnum}`;
   currentSubLevel: `${StandardSubLevelEnum}`;
   nextSubLevel: `${StandardSubLevelEnum}`;
-
   pointPrice: number;
   totalPoints: number;
-  surplusPoints: number;
 
   currentExtraDatasetSize: number;
+  nextExtraDatasetSize: number;
+
+  currentExtraPoints: number;
+  nextExtraPoints: number;
+
+  surplusPoints: number;
+
+  // abandon
+  datasetStoreAmount?: number;
+  renew?: boolean;
 };
 
-export type FeTeamPlanStatusType = {
+export type FeTeamSubType = {
   [SubTypeEnum.standard]?: TeamSubSchema;
-  standardConstants?: TeamStandardSubPlanItemType;
+  [SubTypeEnum.extraDatasetSize]?: TeamSubSchema;
+  [SubTypeEnum.extraPoints]?: TeamSubSchema;
 
+  standardMaxDatasetSize: number;
   totalPoints: number;
   usedPoints: number;
-  standardMaxDatasetSize?: number;
-  standardMaxPoints?: number;
 
-  // standard + extra
+  standardMaxPoints: number;
   datasetMaxSize: number;
   usedDatasetSize: number;
 };

packages/global/support/wallet/usage/api.d.ts

@@ -1,26 +0,0 @@
-import { UsageSourceEnum } from './constants';
-import { UsageListItemCountType, UsageListItemType } from './type';
-
-export type CreateTrainingUsageProps = {
-  name: string;
-  datasetId: string;
-};
-
-export type ConcatUsageProps = UsageListItemCountType & {
-  teamId: string;
-  tmbId: string;
-  billId?: string;
-  totalPoints: number;
-  listIndex?: number;
-};
-
-export type CreateUsageProps = {
-  teamId: string;
-  tmbId: string;
-  appName: string;
-  appId?: string;
-  totalPoints: number;
-  // inputTokens: number;
-  source: `${UsageSourceEnum}`;
-  list: UsageListItemType[];
-};

packages/global/support/wallet/usage/constants.ts

@@ -1,21 +0,0 @@
-export enum UsageSourceEnum {
-  fastgpt = 'fastgpt',
-  api = 'api',
-  shareLink = 'shareLink',
-  training = 'training'
-}
-
-export const UsageSourceMap = {
-  [UsageSourceEnum.fastgpt]: {
-    label: '在线使用'
-  },
-  [UsageSourceEnum.api]: {
-    label: 'Api'
-  },
-  [UsageSourceEnum.shareLink]: {
-    label: '免登录链接'
-  },
-  [UsageSourceEnum.training]: {
-    label: 'dataset.Training Name'
-  }
-};

packages/global/support/wallet/usage/tools.ts

@@ -1,23 +0,0 @@
-/* bill common  */
-import { PRICE_SCALE } from '../constants';
-import { UsageSourceEnum } from './constants';
-import { AuthUserTypeEnum } from '../../permission/constant';
-
-/**
- * dataset price / PRICE_SCALE = real price
- */
-export const formatStorePrice2Read = (val = 0, multiple = 1) => {
-  return Number(((val / PRICE_SCALE) * multiple).toFixed(10));
-};
-
-export const getUsageSourceByAuthType = ({
-  shareId,
-  authType
-}: {
-  shareId?: string;
-  authType?: `${AuthUserTypeEnum}`;
-}) => {
-  if (shareId) return UsageSourceEnum.shareLink;
-  if (authType === AuthUserTypeEnum.apikey) return UsageSourceEnum.api;
-  return UsageSourceEnum.fastgpt;
-};

packages/global/support/wallet/usage/type.d.ts

@@ -1,26 +0,0 @@
-import { CreateUsageProps } from './api';
-import { UsageSourceEnum } from './constants';
-
-export type UsageListItemCountType = {
-  charsLength?: number;
-  duration?: number;
-};
-export type UsageListItemType = UsageListItemCountType & {
-  moduleName: string;
-  amount: number;
-  model?: string;
-};
-
-export type UsageSchemaType = CreateUsageProps & {
-  _id: string;
-  time: Date;
-};
-
-export type UsageItemType = {
-  id: string;
-  time: Date;
-  appName: string;
-  source: UsageSchemaType['source'];
-  totalPoints: number;
-  list: UsageSchemaType['list'];
-};