fix(wecom): standardize commercial plan flow

document/content/self-host/config/env.en.mdx

@@ -338,7 +338,6 @@ These variables are mainly read by `pro/admin`. Admin also uses the shared App/A
 | `BING_OAUTH_CLIENT_SECRET`            | Empty              | Bing OAuth client secret.                                                                                                |
 | `BING_OAUTH_REFRESH_TOKEN`            | Empty              | Bing OAuth refresh token.                                                                                                |
 | `SHOW_WECOM_CONFIG`                   | `false`            | Whether WeCom configuration is shown.                                                                                    |
-| `WECOM_DEV`                           | `false`            | Development mode switch for WeCom Pay.                                                                                   |
 
 ## Code Sandbox Variables
 

document/content/self-host/config/env.mdx

@@ -338,7 +338,6 @@ DOC2X_KEY=your-api-key
 | `BING_OAUTH_CLIENT_SECRET`            | 空           | Bing OAuth Client Secret。                                                         |
 | `BING_OAUTH_REFRESH_TOKEN`            | 空           | Bing OAuth Refresh Token。                                                         |
 | `SHOW_WECOM_CONFIG`                   | `false`      | 是否展示企业微信相关配置。                                                         |
-| `WECOM_DEV`                           | `false`      | 企业微信支付相关开发模式开关。                                                     |
 
 ## Code Sandbox 变量
 

packages/global/support/user/type.ts

@@ -11,9 +11,7 @@ export const UserTagsSchema = z.enum(['wecom']);
 export const UserTagsEnum = UserTagsSchema.enum;
 export type UserTagsType = z.infer<typeof UserTagsSchema>;
 
-export type UserMetaType = {
-  isActivatedWecomLicense?: boolean;
-};
+export type UserMetaType = Record<string, unknown>;
 
 export type UserModelSchema = {
   _id: string;
@@ -58,8 +56,7 @@ export const TeamMetaSchema = z.object({
   wecom: z
     .object({
       permanentCode: z.string(),
-      corpId: z.string(),
-      licenseCapacity: z.int().min(0).default(0)
+      corpId: z.string()
     })
     .optional()
 });

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

@@ -38,14 +38,6 @@ export const TeamStandardSubPlanItemSchema = z.object({
   // Active
   annualBonusPoints: z.int().optional(), // 年度赠送积分
 
-  /** 企微设置 */
-  wecom: z
-    .object({
-      price: z.number().describe('企微价格'),
-      points: z.number().describe('企微积分')
-    })
-    .nullish(),
-
   /** @deprecated */
   pointPrice: z.number().optional()
 });
@@ -103,13 +95,7 @@ const TeamStandardSubPlanItemInputSchema = TeamStandardSubPlanItemSchema.extend(
   maxUploadFileSize: configOptionalIntegerInputSchema,
   maxUploadFileCount: configOptionalIntegerInputSchema,
   annualBonusPoints: configOptionalIntegerInputSchema,
-  pointPrice: configOptionalNumberInputSchema,
-  wecom: z
-    .object({
-      price: NumSchema.nonnegative(),
-      points: NumSchema.nonnegative()
-    })
-    .nullish()
+  pointPrice: configOptionalNumberInputSchema
 });
 
 const CustomStandardSubPlanItemInputSchema = z.preprocess((value) => {

packages/service/support/user/team/teamMemberSchema.ts

@@ -80,6 +80,15 @@ defineIndex(TeamMemberSchema, {
   key: { userId: 1, teamId: 1 },
   options: { unique: true, background: true }
 });
+defineIndex(TeamMemberSchema, {
+  key: { teamId: 1, wecomUserId: 1 },
+  options: {
+    unique: true,
+    partialFilterExpression: { wecomUserId: { $exists: true } },
+    background: true
+  },
+  deprecated: true
+});
 
 export const MongoTeamMember = getMongoModel<TeamMemberType>(
   TeamMemberCollectionName,

packages/service/support/wallet/sub/utils.ts

@@ -13,7 +13,7 @@ import type {
 } from '@fastgpt/global/support/wallet/sub/type';
 import dayjs from 'dayjs';
 import { type ClientSession } from '../../../common/mongo';
-import { addMonths, addDays } from 'date-fns';
+import { addMonths } from 'date-fns';
 import { readFromSecondary } from '../../../common/mongo/utils';
 import { TeamPointCache, teamQpmCache } from '@fastgpt/dal/redis/caches';
 import { getLogger, LogCategories } from '../../../common/logger';
@@ -65,7 +65,6 @@ export const buildStandardPlan = (
   priceDescription: standardConstants.priceDescription,
   customFormUrl: standardConstants.customFormUrl,
   customDescriptions: standardConstants.customDescriptions,
-  wecom: standardConstants.wecom,
   maxTeamMember: standard?.maxTeamMember ?? standardConstants.maxTeamMember,
   maxAppAmount: standard?.maxApp ?? standardConstants.maxAppAmount,
   maxDatasetAmount: standard?.maxDataset ?? standardConstants.maxDatasetAmount,
@@ -85,44 +84,19 @@ export const buildStandardPlan = (
 
 export const initTeamFreePlan = async ({
   teamId,
-  isWecomTeam = false,
   session
 }: {
   teamId: string;
-  isWecomTeam?: boolean;
   session?: ClientSession;
 }) => {
-  const freePoints = isWecomTeam
-    ? Math.round((global.subPlans?.standard?.basic?.totalPoints ?? 4000) / 2)
-    : global?.subPlans?.standard?.[StandardSubLevelEnum.free]?.totalPoints || 100;
+  const freePoints = global?.subPlans?.standard?.[StandardSubLevelEnum.free]?.totalPoints || 100;
 
   const freePlan = await MongoTeamSub.findOne({
     teamId,
     type: SubTypeEnum.standard,
     currentSubLevel: StandardSubLevelEnum.free
   });
 
-  // Get basic plan config for wecom mode
-  const specialConfig: Record<string, any> | null = (() => {
-    const config = global?.subPlans?.standard?.[StandardSubLevelEnum.basic];
-    if (isWecomTeam && config) {
-      return {
-        maxTeamMember: config.maxTeamMember,
-        maxApp: config.maxAppAmount,
-        maxDataset: config.maxDatasetAmount,
-        requestsPerMinute: config.requestsPerMinute,
-        chatHistoryStoreDuration: config.chatHistoryStoreDuration,
-        maxDatasetSize: config.maxDatasetSize,
-        websiteSyncPerDataset: config.websiteSyncPerDataset,
-        appRegistrationCount: config.appRegistrationCount,
-        auditLogStoreDuration: config.auditLogStoreDuration,
-        ticketResponseTime: config.ticketResponseTime,
-        customDomain: config.customDomain
-      } as TeamSubSchemaType;
-    }
-    return null;
-  })();
-
   // Reset one month free plan
   if (freePlan) {
     freePlan.currentMode = SubModeEnum.month;
@@ -139,13 +113,6 @@ export const initTeamFreePlan = async ({
         ? freePlan.surplusPoints + freePoints
         : freePoints;
 
-    // Apply basic plan config for wecom, but with limited points and dataset size
-    if (specialConfig) {
-      for (const key in specialConfig) {
-        (freePlan as any)[key] = specialConfig[key];
-      }
-    }
-
     return freePlan.save({ session });
   }
 
@@ -157,32 +124,34 @@ export const initTeamFreePlan = async ({
         currentMode: SubModeEnum.month,
         nextMode: SubModeEnum.month,
         startTime: new Date(),
-        expiredTime: isWecomTeam ? addDays(new Date(), 15) : addMonths(new Date(), 1),
+        expiredTime: addMonths(new Date(), 1),
 
         currentSubLevel: StandardSubLevelEnum.free,
         nextSubLevel: StandardSubLevelEnum.free,
 
         totalPoints: freePoints,
-        surplusPoints: freePoints,
-        ...(specialConfig && specialConfig)
+        surplusPoints: freePoints
       }
     ],
     { session, ordered: true }
   );
 };
 
 // 获取团队标准套餐
-export const getTeamStandPlan = async ({ teamId }: { teamId: string }) => {
-  const standardPlans = global.subPlans?.standard;
+export const getTeamStandPlan = async ({
+  teamId,
+  readFromPrimary = false
+}: {
+  teamId: string;
+  readFromPrimary?: boolean;
+}) => {
   const plans = await MongoTeamSub.find(
     {
       teamId,
       type: SubTypeEnum.standard
     },
     undefined,
-    {
-      ...readFromSecondary
-    }
+    readFromPrimary ? { readPreference: 'primary' } : { ...readFromSecondary }
   ).lean();
   sortStandPlans(plans);
 

packages/service/test/common/mongo/indexManager.test.ts

@@ -94,6 +94,46 @@ describe('MongoIndexManager.syncModelIndexes', () => {
     });
   });
 
+  it('removes deprecated partial compound indexes', async () => {
+    const schema = new Schema(
+      {
+        teamId: String,
+        wecomUserId: String
+      },
+      { autoIndex: false }
+    );
+    defineDeprecatedTestIndexes(schema, [
+      {
+        indexName: 'teamId_1_wecomUserId_1',
+        key: { teamId: 1, wecomUserId: 1 },
+        options: {
+          unique: true,
+          partialFilterExpression: { wecomUserId: { $exists: true } }
+        }
+      }
+    ]);
+    const model = createModel({ schema });
+    await model.collection.createIndex(
+      { teamId: 1, wecomUserId: 1 },
+      {
+        name: 'teamId_1_wecomUserId_1',
+        unique: true,
+        partialFilterExpression: { wecomUserId: { $exists: true } }
+      }
+    );
+
+    const result = await MongoIndexManager.syncModelIndexes({ model, logger });
+
+    expect(await getIndexNames(model)).not.toContain('teamId_1_wecomUserId_1');
+    expect(result.cleanupReport.items).toEqual([
+      expect.objectContaining({
+        action: 'drop',
+        applied: true,
+        indexName: 'teamId_1_wecomUserId_1'
+      })
+    ]);
+  });
+
   it('does not delete schema-external indexes when the Schema has no deprecated declarations', async () => {
     const schema = new Schema(
       { currentField: String, customerField: String },

packages/service/test/support/user/team/teamMemberSchema.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it } from 'vitest';
+import { MongoTeamMember } from '@fastgpt/service/support/user/team/teamMemberSchema';
+import { getDeprecatedIndexes } from '@fastgpt/service/common/mongo/schemaIndexes';
+
+describe('TeamMember schema', () => {
+  it('does not declare a duplicated WeCom user identity or active index', () => {
+    expect(MongoTeamMember.schema.path('wecomUserId')).toBeUndefined();
+    expect(MongoTeamMember.schema.indexes()).not.toContainEqual([
+      { teamId: 1, wecomUserId: 1 },
+      expect.any(Object)
+    ]);
+  });
+
+  it('registers the removed WeCom index for safe cleanup', () => {
+    expect(getDeprecatedIndexes(MongoTeamMember.schema)).toContainEqual({
+      indexName: 'teamId_1_wecomUserId_1',
+      key: { teamId: 1, wecomUserId: 1 },
+      options: {
+        unique: true,
+        partialFilterExpression: { wecomUserId: { $exists: true } }
+      }
+    });
+  });
+});

packages/service/test/support/wallet/sub/utils.test.ts

@@ -22,6 +22,7 @@ import {
 } from '@fastgpt/service/support/wallet/sub/utils';
 import { MongoTeamSub } from '@fastgpt/service/support/wallet/sub/schema';
 import { redisCacheAdapter } from '@fastgpt/dal/redis/adapter';
+import { addMonths } from 'date-fns';
 
 // Valid ObjectId for testing
 const mockTeamId = '507f1f77bcf86cd799439011';
@@ -444,21 +445,11 @@ describe('buildStandardPlan', () => {
       expect(result.customDescriptions).toEqual(['特性A', '特性B']);
     });
 
-    it('wecom 取自 standardConstants', () => {
-      const constants: TeamStandardSubPlanItemType = {
-        ...baseConstants,
-        wecom: { price: 9.9, points: 500 }
-      };
-      const result = buildStandardPlan(baseStandard, constants);
-      expect(result.wecom).toEqual({ price: 9.9, points: 500 });
-    });
-
     it('standardConstants 展示字段为 undefined 时结果也为 undefined', () => {
       const result = buildStandardPlan(baseStandard, baseConstants);
       expect(result.priceDescription).toBeUndefined();
       expect(result.customFormUrl).toBeUndefined();
       expect(result.customDescriptions).toBeUndefined();
-      expect(result.wecom).toBeUndefined();
     });
   });
 
@@ -691,6 +682,9 @@ describe('initTeamFreePlan', () => {
 
     expect(MongoTeamSub.findOne).toHaveBeenCalled();
     expect(MongoTeamSub.create).toHaveBeenCalled();
+    const [createdPlan] = (MongoTeamSub.create as any).mock.calls[0][0];
+    expect(createdPlan.expiredTime).toEqual(addMonths(createdPlan.startTime, 1));
+    expect(createdPlan.maxTeamMember).toBeUndefined();
     expect(result).toEqual([mockCreatedPlan]);
   });
 
@@ -790,6 +784,24 @@ describe('getTeamStandPlan', () => {
     expect(result[SubTypeEnum.standard]?.name).toBe('Basic Plan');
   });
 
+  it('支持强制从主库读取团队标准套餐', async () => {
+    const mockQuery = {
+      lean: vi.fn().mockResolvedValue([])
+    };
+    vi.spyOn(MongoTeamSub, 'find').mockReturnValue(mockQuery as any);
+
+    await getTeamStandPlan({ teamId: mockTeamId, readFromPrimary: true });
+
+    expect(MongoTeamSub.find).toHaveBeenCalledWith(
+      {
+        teamId: mockTeamId,
+        type: SubTypeEnum.standard
+      },
+      undefined,
+      { readPreference: 'primary' }
+    );
+  });
+
   it('开启标准套餐配置但没有套餐记录时返回 undefined', async () => {
     vi.spyOn(MongoTeamSub, 'find').mockReturnValue({
       lean: vi.fn().mockResolvedValue([])

projects/app/src/components/CommunityModal/index.tsx

@@ -4,13 +4,10 @@ import MyModal from '@fastgpt/web/components/common/MyModal';
 import { useClientTranslation } from '@fastgpt/web/i18n/useClientTranslation';
 import Markdown from '../Markdown';
 import { useSystemStore } from '@/web/common/system/useSystemStore';
-import { useUserStore } from '@/web/support/user/useUserStore';
 
 const CommunityModal = ({ onClose }: { onClose: () => void }) => {
   const { t } = useClientTranslation();
   const { feConfigs } = useSystemStore();
-  const { userInfo } = useUserStore();
-  const isWecomTeam = !!userInfo?.team.isWecomTeam;
 
   return (
     <MyModal
@@ -20,11 +17,7 @@ const CommunityModal = ({ onClose }: { onClose: () => void }) => {
       title={t('common:system.Concat us')}
     >
       <ModalBody textAlign={'center'}>
-        {isWecomTeam ? (
-          t('common:contact_email', { email: 'archer@fastgpt.io' })
-        ) : (
-          <Markdown source={feConfigs?.concatMd || ''} />
-        )}
+        <Markdown source={feConfigs?.concatMd || ''} />
       </ModalBody>
 
       <ModalFooter>

projects/app/src/components/support/user/inform/EnterpriseAuthNoticeModal.tsx

@@ -69,6 +69,7 @@ const EnterpriseAuthNoticeModal = () => {
     router.pathname === '/dashboard/agent' &&
     !!feConfigs?.show_enterprise_auth &&
     !!teamId &&
+    !userInfo?.team?.isWecomTeam &&
     canCheckEnterpriseAuthNotice &&
     !isAccountCancellationPending &&
     !enterpriseAuthNoticeReadTeamIds?.includes(teamId);