New pay (#2484) (#2510)

* New pay (#2484) * remove sub status * feat: new pay mode * fix: ts * limit
2025-07-23 05:12:39 +00:00 · 2024-08-26 09:52:09 +08:00
parent a4c19fbd0a
commit c1d08c0ccc
17 changed files with 170 additions and 440 deletions
--- a/packages/global/support/wallet/bill/api.d.ts
+++ b/packages/global/support/wallet/bill/api.d.ts
@@ -1,16 +1,25 @@
+import { StandardSubLevelEnum, SubModeEnum } from '../sub/constants';
 import { BillTypeEnum } from './constants';

-export type CreateBillProps = {
-  type: BillTypeEnum;
-
-  // balance
-  balance?: number; // read
-
-  month?: number;
-  // extra dataset size
-  extraDatasetSize?: number; // 1k
-  extraPoints?: number; // 100w
+export type CreateStandPlanBill = {
+  type: BillTypeEnum.standSubPlan;
+  level: `${StandardSubLevelEnum}`;
+  subMode: `${SubModeEnum}`;
 };
+type CreateExtractPointsBill = {
+  type: BillTypeEnum.extraPoints;
+  extraPoints: number;
+};
+type CreateExtractDatasetBill = {
+  type: BillTypeEnum.extraDatasetSub;
+  extraDatasetSize: number;
+  month: number;
+};
+export type CreateBillProps =
+  | CreateStandPlanBill
+  | CreateExtractPointsBill
+  | CreateExtractDatasetBill;
+
 export type CreateBillResponse = {
  billId: string;
  codeUrl: string;
--- a/packages/global/support/wallet/bill/type.d.ts
+++ b/packages/global/support/wallet/bill/type.d.ts
@@ -19,7 +19,6 @@ export type BillSchemaType = {
    month?: number;
    datasetSize?: number;
    extraPoints?: number;
-    invoice: boolean;
  };
 };

--- a/packages/global/support/wallet/sub/constants.ts
+++ b/packages/global/support/wallet/sub/constants.ts
@@ -1,3 +1,5 @@
+import { i18nT } from '../../../../web/i18n/utils';
+
 export enum SubTypeEnum {
  standard = 'standard',
  extraDatasetSize = 'extraDatasetSize',
@@ -19,19 +21,6 @@ export const subTypeMap = {
  }
 };

-export enum SubStatusEnum {
-  active = 'active',
-  expired = 'expired'
-}
-export const subStatusMap = {
-  [SubStatusEnum.active]: {
-    label: 'support.wallet.subscription.status.active'
-  },
-  [SubStatusEnum.expired]: {
-    label: 'support.wallet.subscription.status.canceled'
-  }
-};
-
 export enum SubModeEnum {
  month = 'month',
  year = 'year'
@@ -56,23 +45,28 @@ export enum StandardSubLevelEnum {
 }
 export const standardSubLevelMap = {
  [StandardSubLevelEnum.free]: {
-    label: 'support.wallet.subscription.standardSubLevel.free',
-    desc: 'support.wallet.subscription.standardSubLevel.free desc'
+    label: i18nT('common:support.wallet.subscription.standardSubLevel.free'),
+    desc: i18nT('common:support.wallet.subscription.standardSubLevel.free desc'),
+    weight: 1
  },
  [StandardSubLevelEnum.experience]: {
-    label: 'support.wallet.subscription.standardSubLevel.experience',
-    desc: ''
+    label: i18nT('common:support.wallet.subscription.standardSubLevel.experience'),
+    desc: '',
+    weight: 2
  },
  [StandardSubLevelEnum.team]: {
-    label: 'support.wallet.subscription.standardSubLevel.team',
-    desc: ''
+    label: i18nT('common:support.wallet.subscription.standardSubLevel.team'),
+    desc: '',
+    weight: 3
  },
  [StandardSubLevelEnum.enterprise]: {
-    label: 'support.wallet.subscription.standardSubLevel.enterprise',
-    desc: ''
+    label: i18nT('common:support.wallet.subscription.standardSubLevel.enterprise'),
+    desc: '',
+    weight: 4
  },
  [StandardSubLevelEnum.custom]: {
-    label: 'support.wallet.subscription.standardSubLevel.custom',
-    desc: ''
+    label: i18nT('common:support.wallet.subscription.standardSubLevel.custom'),
+    desc: '',
+    weight: 5
  }
 };
--- a/packages/global/support/wallet/sub/type.d.ts
+++ b/packages/global/support/wallet/sub/type.d.ts
@@ -1,4 +1,4 @@
-import { StandardSubLevelEnum, SubModeEnum, SubStatusEnum, SubTypeEnum } from './constants';
+import { StandardSubLevelEnum, SubModeEnum, SubTypeEnum } from './constants';

 // Content of plan
 export type TeamStandardSubPlanItemType = {
@@ -36,17 +36,14 @@ export type TeamSubSchema = {
  _id: string;
  teamId: string;
  type: `${SubTypeEnum}`;
-  status: `${SubStatusEnum}`;
  startTime: Date;
  expiredTime: Date;
-  price: number;

  currentMode: `${SubModeEnum}`;
  nextMode: `${SubModeEnum}`;
-  currentSubLevel: `${StandardSubLevelEnum}`;
-  nextSubLevel: `${StandardSubLevelEnum}`;
+  currentSubLevel: StandardSubLevelEnum;
+  nextSubLevel: StandardSubLevelEnum;

-  pointPrice: number;
  totalPoints: number;
  surplusPoints: number;

--- a/packages/service/support/wallet/sub/schema.ts
+++ b/packages/service/support/wallet/sub/schema.ts
@@ -7,10 +7,9 @@ import { connectionMongo, getMongoModel } from '../../../common/mongo';
 const { Schema } = connectionMongo;
 import { TeamCollectionName } from '@fastgpt/global/support/user/team/constant';
 import {
-  standardSubLevelMap,
-  subModeMap,
-  subStatusMap,
-  subTypeMap
+  StandardSubLevelEnum,
+  SubModeEnum,
+  SubTypeEnum
 } from '@fastgpt/global/support/wallet/sub/constants';
 import type { TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';

@@ -24,12 +23,7 @@ const SubSchema = new Schema({
  },
  type: {
    type: String,
-    enum: Object.keys(subTypeMap),
-    required: true
-  },
-  status: {
-    type: String,
-    enum: Object.keys(subStatusMap),
+    enum: Object.values(SubTypeEnum),
    required: true
  },
  startTime: {
@@ -40,38 +34,29 @@ const SubSchema = new Schema({
    type: Date,
    required: true
  },
-  price: {
-    // last sub pay price(total price)
-    type: Number,
-    required: true
-  },

  // standard sub
  currentMode: {
    type: String,
-    enum: Object.keys(subModeMap)
+    enum: Object.values(SubModeEnum)
  },
  nextMode: {
    type: String,
-    enum: Object.keys(subModeMap)
+    enum: Object.values(SubModeEnum)
  },
  currentSubLevel: {
    type: String,
-    enum: Object.keys(standardSubLevelMap)
+    enum: Object.values(StandardSubLevelEnum)
  },
  nextSubLevel: {
    type: String,
-    enum: Object.keys(standardSubLevelMap)
+    enum: Object.values(StandardSubLevelEnum)
  },

  // stand sub and extra points sub. Plan total points
  totalPoints: {
    type: Number
  },
-  pointPrice: {
-    // stand level point total price
-    type: Number
-  },
  surplusPoints: {
    // plan surplus points
    type: Number
--- a/packages/service/support/wallet/sub/utils.ts
+++ b/packages/service/support/wallet/sub/utils.ts
@@ -1,26 +1,45 @@
 import {
  StandardSubLevelEnum,
  SubModeEnum,
-  SubStatusEnum,
-  SubTypeEnum
+  SubTypeEnum,
+  standardSubLevelMap
 } from '@fastgpt/global/support/wallet/sub/constants';
 import { MongoTeamSub } from './schema';
-import { FeTeamPlanStatusType } from '@fastgpt/global/support/wallet/sub/type.d';
+import { FeTeamPlanStatusType, TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type.d';
 import { getVectorCountByTeamId } from '../../../common/vectorStore/controller';
 import dayjs from 'dayjs';
 import { ClientSession } from '../../../common/mongo';
 import { addMonths } from 'date-fns';
+import { readFromSecondary } from '../../../common/mongo/utils';

-export const getStandardPlans = () => {
+export const getStandardPlansConfig = () => {
  return global?.subPlans?.standard;
 };
-export const getStandardPlan = (level: `${StandardSubLevelEnum}`) => {
+export const getStandardPlanConfig = (level: `${StandardSubLevelEnum}`) => {
  return global.subPlans?.standard?.[level];
 };

+export const sortStandPlans = (plans: TeamSubSchema[]) => {
+  return plans.sort(
+    (a, b) =>
+      standardSubLevelMap[b.currentSubLevel].weight - standardSubLevelMap[a.currentSubLevel].weight
+  );
+};
 export const getTeamStandPlan = async ({ teamId }: { teamId: string }) => {
+  const plans = await MongoTeamSub.find(
+    {
+      teamId,
+      type: SubTypeEnum.standard
+    },
+    undefined,
+    {
+      ...readFromSecondary
+    }
+  );
+  sortStandPlans(plans);
+
  const standardPlans = global.subPlans?.standard;
-  const standard = await MongoTeamSub.findOne({ teamId, type: SubTypeEnum.standard }).lean();
+  const standard = plans[0];

  return {
    [SubTypeEnum.standard]: standard,
@@ -38,12 +57,11 @@ export const initTeamStandardPlan2Free = async ({
  teamId: string;
  session?: ClientSession;
 }) => {
-  const freePoints = global?.subPlans?.standard?.free?.totalPoints || 100;
+  const freePoints = global?.subPlans?.standard?.[StandardSubLevelEnum.free]?.totalPoints || 100;

  const teamStandardSub = await MongoTeamSub.findOne({ teamId, type: SubTypeEnum.standard });

  if (teamStandardSub) {
-    teamStandardSub.status = SubStatusEnum.active;
    teamStandardSub.currentMode = SubModeEnum.month;
    teamStandardSub.nextMode = SubModeEnum.month;
    teamStandardSub.startTime = new Date();
@@ -52,9 +70,6 @@ export const initTeamStandardPlan2Free = async ({
    teamStandardSub.currentSubLevel = StandardSubLevelEnum.free;
    teamStandardSub.nextSubLevel = StandardSubLevelEnum.free;

-    teamStandardSub.price = 0;
-    teamStandardSub.pointPrice = 0;
-
    teamStandardSub.totalPoints = freePoints;
    teamStandardSub.surplusPoints =
      teamStandardSub.surplusPoints && teamStandardSub.surplusPoints < 0
@@ -68,13 +83,10 @@ export const initTeamStandardPlan2Free = async ({
      {
        teamId,
        type: SubTypeEnum.standard,
-        status: SubStatusEnum.active,
        currentMode: SubModeEnum.month,
        nextMode: SubModeEnum.month,
        startTime: new Date(),
        expiredTime: addMonths(new Date(), 1),
-        price: 0,
-        pointPrice: 0,

        currentSubLevel: StandardSubLevelEnum.free,
        nextSubLevel: StandardSubLevelEnum.free,
@@ -94,21 +106,27 @@ export const getTeamPlanStatus = async ({
 }): Promise<FeTeamPlanStatusType> => {
  const standardPlans = global.subPlans?.standard;

+  /* Get all plans and datasetSize */
  const [plans, usedDatasetSize] = await Promise.all([
    MongoTeamSub.find({ teamId }).lean(),
    getVectorCountByTeamId(teamId)
  ]);

-  const standard = plans.find((plan) => plan.type === SubTypeEnum.standard);
+  /* Get all standardPlans and active standardPlan */
+  const teamStandardPlans = sortStandPlans(
+    plans.filter((plan) => plan.type === SubTypeEnum.standard)
+  );
+  const standardPlan = teamStandardPlans[0];
+
  const extraDatasetSize = plans.filter((plan) => plan.type === SubTypeEnum.extraDatasetSize);
  const extraPoints = plans.filter((plan) => plan.type === SubTypeEnum.extraPoints);

  // Free user, first login after expiration. The free subscription plan will be reset
  if (
-    standard &&
-    standard.expiredTime &&
-    standard.currentSubLevel === StandardSubLevelEnum.free &&
-    dayjs(standard.expiredTime).isBefore(new Date())
+    standardPlan &&
+    standardPlan.expiredTime &&
+    standardPlan.currentSubLevel === StandardSubLevelEnum.free &&
+    dayjs(standardPlan.expiredTime).isBefore(new Date())
  ) {
    console.log('Init free stand plan', { teamId });
    await initTeamStandardPlan2Free({ teamId });
@@ -116,26 +134,26 @@ export const getTeamPlanStatus = async ({
  }

  const totalPoints = standardPlans
-    ? (standard?.totalPoints || 0) +
+    ? (standardPlan?.totalPoints || 0) +
      extraPoints.reduce((acc, cur) => acc + (cur.totalPoints || 0), 0)
    : Infinity;
  const surplusPoints =
-    (standard?.surplusPoints || 0) +
+    (standardPlan?.surplusPoints || 0) +
    extraPoints.reduce((acc, cur) => acc + (cur.surplusPoints || 0), 0);

  const standardMaxDatasetSize =
-    standard?.currentSubLevel && standardPlans
-      ? standardPlans[standard.currentSubLevel]?.maxDatasetSize || Infinity
+    standardPlan?.currentSubLevel && standardPlans
+      ? standardPlans[standardPlan.currentSubLevel]?.maxDatasetSize || Infinity
      : Infinity;
  const totalDatasetSize =
    standardMaxDatasetSize +
    extraDatasetSize.reduce((acc, cur) => acc + (cur.currentExtraDatasetSize || 0), 0);

  return {
-    [SubTypeEnum.standard]: standard,
+    [SubTypeEnum.standard]: standardPlan,
    standardConstants:
-      standard?.currentSubLevel && standardPlans
-        ? standardPlans[standard.currentSubLevel]
+      standardPlan?.currentSubLevel && standardPlans
+        ? standardPlans[standardPlan.currentSubLevel]
        : undefined,

    totalPoints,
--- a/packages/web/i18n/en/common.json
+++ b/packages/web/i18n/en/common.json
@@ -1331,7 +1331,7 @@
        "FAQ": "Frequently asked questions",
        "Month amount": "Months",
        "Next plan": "Future plan",
-        "Nonsupport": "Unable to switch",
+        "Nonsupport": "No purchase required",
        "Stand plan level": "Subscription plan",
        "Standard update fail": "Failed to modify subscription plan",
        "Standard update success": "Subscription plan change successful!",
@@ -1360,6 +1360,7 @@
        "point": "integral",
        "rerank": "Rerank",
        "standardSubLevel": {
+          "custom": "Customized version",
          "enterprise": "Enterprise edition",
          "experience": "Experience edition",
          "free": "Free edition",
--- a/packages/web/i18n/en/user.json
+++ b/packages/web/i18n/en/user.json
@@ -1,6 +1,8 @@
 {
  "bill": {
-    "not_need_invoice": "Balance payment, unable to issue invoice"
+    "buy_standard_plan_success": "Package purchased successfully",
+    "not_need_invoice": "Balance payment, unable to issue invoice",
+    "renew_plan": "Renewal package"
  },
  "bind_inform_account_error": "Abnormal binding notification account",
  "bind_inform_account_success": "Binding notification account successful",
--- a/packages/web/i18n/zh/common.json
+++ b/packages/web/i18n/zh/common.json
@@ -1116,7 +1116,7 @@
    "old_package_price": "旧套餐余额",
    "other": "其他金额，请取整数",
    "to_recharge": "余额不足，去充值",
-    "wechat": "请微信扫码支付: {{price}}元，请勿关闭页面",
+    "wechat": "请微信扫码支付: {{price}}元\n请勿关闭页面",
    "yuan": "{{amount}}元"
  },
  "permission": {
@@ -1331,7 +1331,7 @@
        "FAQ": "常见问题",
        "Month amount": "月数",
        "Next plan": "未来套餐",
-        "Nonsupport": "无法切换",
+        "Nonsupport": "无需购买",
        "Stand plan level": "订阅套餐",
        "Standard update fail": "修改订阅套餐异常",
        "Standard update success": "变更订阅套餐成功！",
@@ -1360,6 +1360,7 @@
        "point": "积分",
        "rerank": "检索结果重排",
        "standardSubLevel": {
+          "custom": "自定义版",
          "enterprise": "企业版",
          "experience": "体验版",
          "free": "免费版",
--- a/packages/web/i18n/zh/user.json
+++ b/packages/web/i18n/zh/user.json
@@ -11,7 +11,9 @@
    "use_balance_hint": "由于系统升级，原“自动续费从余额扣款”模式取消，余额充值入口关闭。您的余额可用于购买积分",
    "contact_customer_service": "联系客服",
    "convert_success": "兑换成功",
-    "convert_error": "兑换失败"
+    "convert_error": "兑换失败",
+    "buy_standard_plan_success": "购买套餐成功",
+    "renew_plan": "续费套餐"
  },
  "bind_inform_account_error": "绑定通知账号异常",
  "bind_inform_account_success": "绑定通知账号成功",