V4.9.7 feature (#4669)

* update doc * feat: Add coupon redemption feature for team subscriptions (#4595) * feat: Add coupon redemption feature for team subscriptions - Introduced `TeamCouponSub` and `TeamCouponSchema` types - Added `redeemCoupon` API endpoint - Updated UI to include a modal for coupon redemption - Added new icon and translations for "Redeem coupon" * perf: remove field teamId * perf: use dynamic import * refactor: move to page component * perf: coupon code * perf: mcp server * perf: test * auto layout (#4634) * fix 4.9.6 (#4631) * fix debug quote list * delete next text node match * fix extract default boolean value * export latest 100 chat items * fix quote item ui * doc * fix doc * feat: auto layout * perf: auto layout * fix: auto layout null * add start node --------- Co-authored-by: heheer <heheer@sealos.io> * fix: share link (#4644) * Add workflow run duration；Get audio duration (#4645) * add duration * get audio duration * Custom config path (#4649) * feat: 通过环境变量DATA_PATH获取配置文件目录 (#4622) 通过环境变量DATA_PATH获取配置文件目录，以应对不同的部署方式的多样化需求 * feat: custom configjson path * doc --------- Co-authored-by: John Chen <sss1991@163.com> * 程序api调用场景下，如果大量调用带有图片或视频，产生的聊天记录会导致后台mongo数据库异常。这个修改给api客户端一个禁止生成聊天记录的选项，避免这个后果。 (#3964) * update special chatId * perf: vector db rename * update operationLog (#4647) * update operationLog * combine operationLogMap * solve operationI18nLogMap bug * remoce log * feat: Rerank usage (#4654) * refresh concat when update (#4655) * fix: refresh code * perf: timer lock * Fix operationLog (#4657) * perf: http streamable mcp * add alipay (#4630) * perf: subplan ui * perf: pay code * hiden bank tip * Fix: pay error (#4665) * fix quote number (#4666) * remove log --------- Co-authored-by: a.e. <49438478+I-Info@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: John Chen <sss1991@163.com> Co-authored-by: gaord <bengao168@msn.com> Co-authored-by: gggaaallleee <91131304+gggaaallleee@users.noreply.github.com>
2025-04-26 16:17:21 +08:00
parent a669a60fe6
commit 0720bbe4da
143 changed files with 2067 additions and 1093 deletions
--- a/projects/app/src/pageComponents/price/ExtraPlan.tsx
+++ b/projects/app/src/pageComponents/price/ExtraPlan.tsx
@@ -1,21 +1,20 @@
 import { Box, Flex, Grid, Button, VStack } from '@chakra-ui/react';
 import { useTranslation } from 'next-i18next';
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import { useForm } from 'react-hook-form';
 import { useToast } from '@fastgpt/web/hooks/useToast';
-import { getErrText } from '@fastgpt/global/common/error/utils';
-import { getWxPayQRCode } from '@/web/support/wallet/bill/api';
+import { postCreatePayBill } from '@/web/support/wallet/bill/api';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRCodePayModal';
 import MyNumberInput from '@fastgpt/web/components/common/Input/NumberInput';
+import { useRequest2 } from '@fastgpt/web/hooks/useRequest';

 const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
  const { t } = useTranslation();
  const { toast } = useToast();
  const { subPlans } = useSystemStore();
-  const [loading, setLoading] = useState(false);
  const [qrPayData, setQRPayData] = useState<QRPayProps>();

  // extra dataset
@@ -26,40 +25,33 @@ const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
      month: 1
    }
  });
-  const onclickBuyDatasetSize = useCallback(
+  const { runAsync: onclickBuyDatasetSize, loading: isLoadingBuyDatasetSize } = useRequest2(
    async ({ datasetSize, month }: { datasetSize: number; month: number }) => {
-      try {
-        datasetSize = Math.ceil(datasetSize);
-        month = Math.ceil(month);
+      datasetSize = Math.ceil(datasetSize);
+      month = Math.ceil(month);

-        const datasetSizePayAmount = datasetSize * month * extraDatasetPrice;
-        if (datasetSizePayAmount === 0) {
-          return toast({
-            status: 'warning',
-            title: t('common:support.wallet.amount_0')
-          });
-        }
-        setLoading(true);
-
-        const res = await getWxPayQRCode({
-          type: BillTypeEnum.extraDatasetSub,
-          month,
-          extraDatasetSize: datasetSize
-        });
-        setQRPayData({
-          readPrice: res.readPrice,
-          codeUrl: res.codeUrl,
-          billId: res.billId
-        });
-      } catch (err) {
-        toast({
-          title: getErrText(err),
-          status: 'error'
+      const datasetSizePayAmount = datasetSize * month * extraDatasetPrice;
+      if (datasetSizePayAmount === 0) {
+        return toast({
+          status: 'warning',
+          title: t('common:support.wallet.amount_0')
        });
      }
-      setLoading(false);
+
+      const res = await postCreatePayBill({
+        type: BillTypeEnum.extraDatasetSub,
+        month,
+        extraDatasetSize: datasetSize
+      });
+      setQRPayData({
+        tip: t('common:button.extra_dataset_size_tip'),
+        ...res
+      });
    },
-    [extraDatasetPrice, toast]
+    {
+      manual: true,
+      refreshDeps: [extraDatasetPrice]
+    }
  );

  // extra ai points
@@ -70,41 +62,34 @@ const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
      month: 1
    }
  });
-  const onclickBuyExtraPoints = useCallback(
+  const { runAsync: onclickBuyExtraPoints, loading: isLoadingBuyExtraPoints } = useRequest2(
    async ({ points }: { points: number }) => {
-      try {
-        points = Math.ceil(points);
+      points = Math.ceil(points);

-        const month = 1;
-        const payAmount = points * month * extraPointsPrice;
+      const month = 1;
+      const payAmount = points * month * extraPointsPrice;

-        if (payAmount === 0) {
-          return toast({
-            status: 'warning',
-            title: t('common:support.wallet.amount_0')
-          });
-        }
-        setLoading(true);
-
-        const res = await getWxPayQRCode({
-          type: BillTypeEnum.extraPoints,
-          extraPoints: points
-        });
-
-        setQRPayData({
-          readPrice: res.readPrice,
-          codeUrl: res.codeUrl,
-          billId: res.billId
-        });
-      } catch (err) {
-        toast({
-          title: getErrText(err),
-          status: 'error'
+      if (payAmount === 0) {
+        return toast({
+          status: 'warning',
+          title: t('common:support.wallet.amount_0')
        });
      }
-      setLoading(false);
+
+      const res = await postCreatePayBill({
+        type: BillTypeEnum.extraPoints,
+        extraPoints: points
+      });
+
+      setQRPayData({
+        tip: t('common:button.extra_points_tip'),
+        ...res
+      });
    },
-    [extraPointsPrice, toast]
+    {
+      manual: true,
+      refreshDeps: [extraPointsPrice]
+    }
  );

  return (
@@ -184,7 +169,7 @@ const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
            mt={6}
            w={'100%'}
            variant={'primaryGhost'}
-            isLoading={loading}
+            isLoading={isLoadingBuyDatasetSize}
            onClick={handleSubmitDatasetSize(onclickBuyDatasetSize)}
            color={'primary.700'}
          >
@@ -264,7 +249,7 @@ const ExtraPlan = ({ onPaySuccess }: { onPaySuccess?: () => void }) => {
            mt={6}
            w={'100%'}
            variant={'primaryGhost'}
-            isLoading={loading}
+            isLoading={isLoadingBuyExtraPoints}
            onClick={handleSubmitExtraPoints(onclickBuyExtraPoints)}
            color={'primary.700'}
          >
--- a/projects/app/src/pageComponents/price/Standard.tsx
+++ b/projects/app/src/pageComponents/price/Standard.tsx
@@ -8,7 +8,7 @@ import { standardSubLevelMap } from '@fastgpt/global/support/wallet/sub/constant
 import { useRequest2 } from '@fastgpt/web/hooks/useRequest';
 import { TeamSubSchema } from '@fastgpt/global/support/wallet/sub/type';
 import QRCodePayModal, { type QRPayProps } from '@/components/support/wallet/QRCodePayModal';
-import { getWxPayQRCode } from '@/web/support/wallet/bill/api';
+import { postCreatePayBill } from '@/web/support/wallet/bill/api';
 import { BillTypeEnum } from '@fastgpt/global/support/wallet/bill/constants';
 import StandardPlanContentList from '@/components/support/wallet/StandardPlanContentList';

@@ -53,9 +53,9 @@ const Standard = ({
            permissionCustomApiKey: value.permissionCustomApiKey,
            permissionCustomCopyright: value.permissionCustomCopyright,
            trainingWeight: value.trainingWeight,
-            permissionReRank: value.permissionReRank,
            totalPoints: value.totalPoints * (selectSubMode === SubModeEnum.month ? 1 : 12),
-            permissionWebsiteSync: value.permissionWebsiteSync
+            permissionWebsiteSync: value.permissionWebsiteSync,
+            permissionTeamOperationLog: value.permissionTeamOperationLog
          };
        })
      : [];
@@ -65,13 +65,9 @@ const Standard = ({
  const [qrPayData, setQRPayData] = useState<QRPayProps>();

  /* Get pay code */
-  const { runAsync: onPay, loading: isLoading } = useRequest2(getWxPayQRCode, {
+  const { runAsync: onPay, loading: isLoading } = useRequest2(postCreatePayBill, {
    onSuccess(res) {
-      setQRPayData({
-        readPrice: res.readPrice,
-        codeUrl: res.codeUrl,
-        billId: res.billId
-      });
+      setQRPayData(res);
    }
  });