🚀 feat(商品模块): 完成测试数据工厂重构

- 创建 GoodsTestFactory 统一管理测试数据创建
- 重构所有集成测试使用工厂方法
- 修复文件实体 uploadUserId 字段问题
- 确保多租户数据隔离正确性

Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>

packages/goods-module-mt/src/entities/goods-category.entity.mt.ts

@@ -37,7 +37,7 @@ export class GoodsCategoryMt {
   @Column({ name: 'updated_by', type: 'int', unsigned: true, nullable: true, comment: '更新用户ID' })
   updatedBy!: number | null;
 
-  @ManyToOne(() => File, { nullable: true })
+  @ManyToOne(() => FileMt, { nullable: true })
   @JoinColumn({ name: 'image_file_id', referencedColumnName: 'id' })
-  imageFile!: File | null;
+  imageFile!: FileMt | null;
 }

packages/goods-module-mt/src/entities/goods.entity.mt.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, JoinColumn, CreateDateColumn, UpdateDateColumn, ManyToMany, JoinTable, Index } from 'typeorm';
-import { GoodsCategoryMt } from './goods-category.entity.mt.js';
+import { GoodsCategoryMt } from './goods-category.entity.mt';
 import { SupplierMt } from '@d8d/supplier-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { MerchantMt } from '@d8d/merchant-module-mt';
@@ -49,13 +49,13 @@ export class GoodsMt {
   @Column({ name: 'image_file_id', type: 'int', unsigned: true, nullable: true, comment: '商品主图文件ID' })
   imageFileId!: number | null;
 
-  @ManyToMany(() => File)
+  @ManyToMany(() => FileMt)
   @JoinTable({
     name: 'goods_slide_images',
     joinColumn: { name: 'goods_id', referencedColumnName: 'id' },
     inverseJoinColumn: { name: 'file_id', referencedColumnName: 'id' }
   })
-  slideImages!: File[];
+  slideImages!: FileMt[];
 
   @Column({ name: 'detail', type: 'text', nullable: true, comment: '商品详情' })
   detail!: string | null;
@@ -109,9 +109,9 @@ export class GoodsMt {
   @JoinColumn({ name: 'supplier_id', referencedColumnName: 'id' })
   supplier!: SupplierMt | null;
 
-  @ManyToOne(() => File, { nullable: true })
+  @ManyToOne(() => FileMt, { nullable: true })
   @JoinColumn({ name: 'image_file_id', referencedColumnName: 'id' })
-  imageFile!: File | null;
+  imageFile!: FileMt | null;
 
   @ManyToOne(() => MerchantMt, { nullable: true })
   @JoinColumn({ name: 'merchant_id', referencedColumnName: 'id' })

packages/goods-module-mt/src/entities/index.mt.ts

@@ -1,2 +1,2 @@
-export * from './goods.entity.mt.js';
-export * from './goods-category.entity.mt.js';
+export * from './goods.entity.mt';
+export * from './goods-category.entity.mt';

packages/goods-module-mt/src/index.mt.ts

@@ -1,15 +1,15 @@
-export * from './entities/index.mt.js';
-export * from './services/index.mt.js';
-export * from './schemas/index.mt.js';
-export * from './routes/index.mt.js';
-export * from './types/index.mt.js';
+export * from './entities/index.mt.ts';
+export * from './services/index.mt.ts';
+export * from './schemas/index.mt.ts';
+export * from './routes/index.mt.ts';
+export * from './types/index.mt.ts';
 
 // 导出路由
-import { adminGoodsRoutesMt } from './routes/admin-goods-routes.mt.js';
-import { adminGoodsCategoriesRoutesMt } from './routes/admin-goods-categories.mt.js';
-import { userGoodsRoutesMt } from './routes/user-goods-routes.mt.js';
-import { publicGoodsRoutesMt } from './routes/public-goods-routes.mt.js';
-import { publicGoodsRandomRoutesMt } from './routes/public-goods-random.mt.js';
+import { adminGoodsRoutesMt } from './routes/admin-goods-routes.mt.ts';
+import { adminGoodsCategoriesRoutesMt } from './routes/admin-goods-categories.mt.ts';
+import { userGoodsRoutesMt } from './routes/user-goods-routes.mt.ts';
+import { publicGoodsRoutesMt } from './routes/public-goods-routes.mt.ts';
+import { publicGoodsRandomRoutesMt } from './routes/public-goods-random.mt.ts';
 
 export {
   adminGoodsRoutesMt,

packages/goods-module-mt/src/routes/admin-goods-categories.mt.ts

@@ -1,7 +1,7 @@
 import { createCrudRoutes } from '@d8d/shared-crud';
 import { OpenAPIHono } from '@hono/zod-openapi';
-import { GoodsCategoryMt } from '../entities/goods-category.entity.mt.js';
-import { GoodsCategorySchema, CreateGoodsCategoryDto, UpdateGoodsCategoryDto } from '../schemas/goods-category.schema.mt.js';
+import { GoodsCategoryMt } from '../entities/goods-category.entity.mt';
+import { GoodsCategorySchema, CreateGoodsCategoryDto, UpdateGoodsCategoryDto } from '../schemas/goods-category.schema.mt';
 import { authMiddleware } from '@d8d/auth-module-mt';
 
 // 创建基础CRUD路由

packages/goods-module-mt/src/routes/admin-goods-routes.mt.ts

@@ -1,7 +1,7 @@
 import { createCrudRoutes } from '@d8d/shared-crud';
 import { authMiddleware } from '@d8d/auth-module-mt';
-import { GoodsMt } from '../entities/goods.entity.mt.js';
-import { AdminGoodsSchema, AdminCreateGoodsDto, AdminUpdateGoodsDto } from '../schemas/admin-goods.schema.mt.js';
+import { GoodsMt } from '../entities/goods.entity.mt';
+import { AdminGoodsSchema, AdminCreateGoodsDto, AdminUpdateGoodsDto } from '../schemas/admin-goods.schema.mt';
 import { FileMt } from '@d8d/file-module-mt';
 
 export const adminGoodsRoutesMt = createCrudRoutes({
@@ -20,7 +20,7 @@ export const adminGoodsRoutesMt = createCrudRoutes({
   relationFields: {
     slideImageIds: {
       relationName: 'slideImages',
-      targetEntity: File,
+      targetEntity: FileMt,
       joinTableName: 'goods_slide_images'
     }
   },

packages/goods-module-mt/src/routes/index.mt.ts

@@ -1,5 +1,5 @@
-export * from './admin-goods-categories.mt.js';
-export * from './public-goods-random.mt.js';
-export * from './user-goods-routes.mt.js';
-export * from './admin-goods-routes.mt.js';
-export * from './public-goods-routes.mt.js';
+export * from './admin-goods-categories.mt';
+export * from './public-goods-random.mt';
+export * from './user-goods-routes.mt';
+export * from './admin-goods-routes.mt';
+export * from './public-goods-routes.mt';

packages/goods-module-mt/src/routes/public-goods-random.mt.ts

@@ -1,12 +1,12 @@
 import { createRoute, OpenAPIHono } from '@hono/zod-openapi';
 import { z } from '@hono/zod-openapi';
-import { GoodsSchema } from '../schemas/goods.schema.mt.js';
+import { GoodsSchema } from '../schemas/goods.schema.mt';
 import { ErrorSchema } from '@d8d/shared-utils';
 import { AppDataSource } from '@d8d/shared-utils';
-import { GoodsMt } from '../entities/goods.entity.mt.js';
+import { GoodsMt } from '../entities/goods.entity.mt';
 import { AuthContext } from '@d8d/shared-types';
 import { authMiddleware } from '@d8d/auth-module-mt';
-import { RandomGoodsQuerySchema, RandomGoodsResponseSchema } from '../schemas/random.schema.mt.js';
+import { RandomGoodsQuerySchema, RandomGoodsResponseSchema } from '../schemas/random.schema.mt';
 import { parseWithAwait } from '@d8d/shared-utils';
 
 // 定义随机商品列表路由

packages/goods-module-mt/src/routes/public-goods-routes.mt.ts

@@ -1,7 +1,7 @@
 import { Hono } from 'hono';
 import { createCrudRoutes } from '@d8d/shared-crud';
-import { GoodsMt } from '../entities/goods.entity.mt.js';
-import { PublicGoodsSchema, PublicGoodsQueryDto } from '../schemas/public-goods.schema.mt.js';
+import { GoodsMt } from '../entities/goods.entity.mt';
+import { PublicGoodsSchema, PublicGoodsQueryDto } from '../schemas/public-goods.schema.mt';
 import { FileMt } from '@d8d/file-module-mt';
 
 // 创建公开商品路由 - 只读查询，无需认证
@@ -22,7 +22,7 @@ export const publicGoodsRoutesMt = createCrudRoutes({
   relationFields: {
     slideImageIds: {
       relationName: 'slideImages',
-      targetEntity: File,
+      targetEntity: FileMt,
       joinTableName: 'goods_slide_images'
     }
   },

packages/goods-module-mt/src/routes/user-goods-routes.mt.ts

@@ -1,7 +1,7 @@
 import { createCrudRoutes } from '@d8d/shared-crud';
 import { authMiddleware } from '@d8d/auth-module-mt';
-import { GoodsMt } from '../entities/goods.entity.mt.js';
-import { UserGoodsSchema, UserCreateGoodsDto, UserUpdateGoodsDto } from '../schemas/user-goods.schema.mt.js';
+import { GoodsMt } from '../entities/goods.entity.mt';
+import { UserGoodsSchema, UserCreateGoodsDto, UserUpdateGoodsDto } from '../schemas/user-goods.schema.mt';
 import { FileMt } from '@d8d/file-module-mt';
 
 export const userGoodsRoutesMt = createCrudRoutes({
@@ -20,7 +20,7 @@ export const userGoodsRoutesMt = createCrudRoutes({
   relationFields: {
     slideImageIds: {
       relationName: 'slideImages',
-      targetEntity: File,
+      targetEntity: FileMt,
       joinTableName: 'goods_slide_images'
     }
   },

packages/goods-module-mt/src/schemas/admin-goods.schema.mt.ts

@@ -1,5 +1,5 @@
 import { z } from '@hono/zod-openapi';
-import { GoodsCategorySchema } from './goods-category.schema.js';
+import { GoodsCategorySchema } from './goods-category.schema.mt';
 import { SupplierSchema } from '@d8d/supplier-module-mt/schemas';
 import { FileSchema } from '@d8d/file-module-mt/schemas';
 import { MerchantSchemaMt } from '@d8d/merchant-module-mt/schemas';

packages/goods-module-mt/src/schemas/goods.schema.mt.ts

@@ -1,5 +1,5 @@
 import { z } from '@hono/zod-openapi';
-import { GoodsCategorySchema } from './goods-category.schema.mt.js';
+import { GoodsCategorySchema } from './goods-category.schema.mt';
 import { SupplierSchema } from '@d8d/supplier-module-mt/schemas';
 import { FileSchema } from '@d8d/file-module-mt/schemas';
 import { MerchantSchemaMt } from '@d8d/merchant-module-mt/schemas';

packages/goods-module-mt/src/schemas/index.mt.ts

@@ -1,6 +1,6 @@
-export * from './goods.schema.mt.js';
-export * from './goods-category.schema.mt.js';
-export * from './random.schema.mt.js';
-export * from './user-goods.schema.mt.js';
-export * from './admin-goods.schema.mt.js';
-export * from './public-goods.schema.mt.js';
+export * from './goods.schema.mt';
+export * from './goods-category.schema.mt';
+export * from './random.schema.mt';
+export * from './user-goods.schema.mt';
+export * from './admin-goods.schema.mt';
+export * from './public-goods.schema.mt';

packages/goods-module-mt/src/schemas/public-goods.schema.mt.ts

@@ -1,5 +1,5 @@
 import { z } from '@hono/zod-openapi';
-import { GoodsCategorySchema } from './goods-category.schema.js';
+import { GoodsCategorySchema } from './goods-category.schema.mt';
 import { SupplierSchema } from '@d8d/supplier-module-mt/schemas';
 import { FileSchema } from '@d8d/file-module-mt/schemas';
 import { MerchantSchemaMt } from '@d8d/merchant-module-mt/schemas';

packages/goods-module-mt/src/schemas/random.schema.mt.ts

@@ -1,5 +1,5 @@
 import { z } from '@hono/zod-openapi';
-import { GoodsSchema } from './goods.schema.js';
+import { GoodsSchema } from './goods.schema.mt';
 
 // 随机商品列表查询参数Schema
 export const RandomGoodsQuerySchema = z.object({

packages/goods-module-mt/src/schemas/user-goods.schema.mt.ts

@@ -1,5 +1,5 @@
 import { z } from '@hono/zod-openapi';
-import { GoodsCategorySchema } from './goods-category.schema.js';
+import { GoodsCategorySchema } from './goods-category.schema.mt';
 import { SupplierSchema } from '@d8d/supplier-module-mt/schemas';
 import { FileSchema } from '@d8d/file-module-mt/schemas';
 import { MerchantSchemaMt } from '@d8d/merchant-module-mt/schemas';

packages/goods-module-mt/src/services/goods-category.service.mt.ts

@@ -1,6 +1,6 @@
 import { GenericCrudService } from '@d8d/shared-crud';
 import { DataSource } from 'typeorm';
-import { GoodsCategoryMt } from '../entities/goods-category.entity.mt.js';
+import { GoodsCategoryMt } from '../entities/goods-category.entity.mt';
 
 export class GoodsCategoryServiceMt extends GenericCrudService<GoodsCategoryMt> {
   constructor(dataSource: DataSource) {

packages/goods-module-mt/src/services/goods.service.mt.ts

@@ -1,6 +1,6 @@
 import { GenericCrudService } from '@d8d/shared-crud';
 import { DataSource } from 'typeorm';
-import { GoodsMt } from '../entities/goods.entity.mt.js';
+import { GoodsMt } from '../entities/goods.entity.mt';
 
 export class GoodsServiceMt extends GenericCrudService<GoodsMt> {
   constructor(dataSource: DataSource) {

packages/goods-module-mt/src/services/index.mt.ts

@@ -1,2 +1,2 @@
-export * from './goods.service.mt.js';
-export * from './goods-category.service.mt.js';
+export * from './goods.service.mt';
+export * from './goods-category.service.mt';

packages/goods-module-mt/src/types/goods.types.mt.ts

@@ -1,7 +1,7 @@
 import { z } from 'zod';
-import { GoodsSchema, CreateGoodsDto, UpdateGoodsDto } from '../schemas/goods.schema.js';
-import { GoodsCategorySchema, CreateGoodsCategoryDto, UpdateGoodsCategoryDto } from '../schemas/goods-category.schema.js';
-import { RandomGoodsQuery, RandomGoodsResponse } from '../schemas/random.schema.js';
+import { GoodsSchema, CreateGoodsDto, UpdateGoodsDto } from '../schemas/goods.schema.mt';
+import { GoodsCategorySchema, CreateGoodsCategoryDto, UpdateGoodsCategoryDto } from '../schemas/goods-category.schema.mt';
+import { RandomGoodsQuery, RandomGoodsResponse } from '../schemas/random.schema.mt';
 
 // 商品相关类型
 export type Goods = z.infer<typeof GoodsSchema>;

packages/goods-module-mt/src/types/index.mt.ts

@@ -5,9 +5,7 @@ export type {
   GoodsCategory as GoodsCategorySchemaType,
   CreateGoodsCategory as CreateGoodsCategorySchemaType,
   UpdateGoodsCategory as UpdateGoodsCategorySchemaType,
-  RandomGoodsQuery,
-  RandomGoodsResponse,
   GoodsState,
   GoodsCategoryState,
   GoodsType as GoodsTypeEnum
-} from './goods.types.mt.js';
+} from './goods.types.mt';

packages/goods-module-mt/tests/factories/goods-test-factory.ts

@@ -0,0 +1,195 @@
+import { DataSource } from 'typeorm';
+import { UserEntityMt } from '@d8d/user-module-mt';
+import { SupplierMt } from '@d8d/supplier-module-mt';
+import { MerchantMt } from '@d8d/merchant-module-mt';
+import { FileMt } from '@d8d/file-module-mt';
+import { GoodsMt, GoodsCategoryMt } from '../../src/entities/index.mt';
+
+export class GoodsTestFactory {
+  private dataSource: DataSource;
+
+  constructor(dataSource: DataSource) {
+    this.dataSource = dataSource;
+  }
+
+  /**
+   * 创建测试用户
+   */
+  async createTestUser(overrides: Partial<UserEntityMt> = {}): Promise<UserEntityMt> {
+    const userRepository = this.dataSource.getRepository(UserEntityMt);
+    const user = userRepository.create({
+      tenantId: 1,
+      username: `test_user_${Math.floor(Math.random() * 100000)}`,
+      password: 'test_password',
+      nickname: '测试用户',
+      registrationSource: 'web',
+      ...overrides
+    });
+    return await userRepository.save(user);
+  }
+
+  /**
+   * 创建测试管理员用户
+   */
+  async createTestAdmin(overrides: Partial<UserEntityMt> = {}): Promise<UserEntityMt> {
+    const userRepository = this.dataSource.getRepository(UserEntityMt);
+    const admin = userRepository.create({
+      tenantId: 1,
+      username: `test_admin_${Math.floor(Math.random() * 100000)}`,
+      password: 'admin_password',
+      nickname: '测试管理员',
+      registrationSource: 'web',
+      ...overrides
+    });
+    return await userRepository.save(admin);
+  }
+
+  /**
+   * 创建测试供应商
+   */
+  async createTestSupplier(createdBy: number, overrides: Partial<SupplierMt> = {}): Promise<SupplierMt> {
+    const supplierRepository = this.dataSource.getRepository(SupplierMt);
+    const supplier = supplierRepository.create({
+      tenantId: 1,
+      name: '测试供应商',
+      username: `test_supplier_${Math.floor(Math.random() * 100000)}`,
+      password: 'password123',
+      phone: '13800138000',
+      realname: '测试供应商',
+      state: 1,
+      createdBy,
+      ...overrides
+    });
+    return await supplierRepository.save(supplier);
+  }
+
+  /**
+   * 创建测试商户
+   */
+  async createTestMerchant(createdBy: number, overrides: Partial<MerchantMt> = {}): Promise<MerchantMt> {
+    const merchantRepository = this.dataSource.getRepository(MerchantMt);
+    const merchant = merchantRepository.create({
+      tenantId: 1,
+      name: '测试商户',
+      username: `test_merchant_${Math.floor(Math.random() * 100000)}`,
+      password: 'password123',
+      phone: '13800138001',
+      realname: '测试商户',
+      state: 1,
+      createdBy,
+      ...overrides
+    });
+    return await merchantRepository.save(merchant);
+  }
+
+  /**
+   * 创建测试商品分类
+   */
+  async createTestCategory(createdBy: number, overrides: Partial<GoodsCategoryMt> = {}): Promise<GoodsCategoryMt> {
+    const categoryRepository = this.dataSource.getRepository(GoodsCategoryMt);
+    const category = categoryRepository.create({
+      tenantId: 1,
+      name: `测试分类_${Math.floor(Math.random() * 100000)}`,
+      parentId: 0,
+      level: 1,
+      state: 1,
+      createdBy,
+      ...overrides
+    });
+    return await categoryRepository.save(category);
+  }
+
+  /**
+   * 创建测试商品
+   */
+  async createTestGoods(
+    createdBy: number,
+    overrides: Partial<GoodsMt> = {}
+  ): Promise<GoodsMt> {
+    const goodsRepository = this.dataSource.getRepository(GoodsMt);
+
+    // 创建默认的分类、供应商、商户用于测试
+    const testCategory = await this.createTestCategory(createdBy);
+    const testSupplier = await this.createTestSupplier(createdBy);
+    const testMerchant = await this.createTestMerchant(createdBy);
+
+    const goods = goodsRepository.create({
+      tenantId: 1,
+      name: `测试商品_${Math.floor(Math.random() * 100000)}`,
+      price: 100.00,
+      costPrice: 80.00,
+      categoryId1: testCategory.id,
+      categoryId2: testCategory.id,
+      categoryId3: testCategory.id,
+      goodsType: 1,
+      supplierId: testSupplier.id,
+      merchantId: testMerchant.id,
+      state: 1,
+      stock: 100,
+      lowestBuy: 1,
+      createdBy,
+      ...overrides
+    });
+    return await goodsRepository.save(goods);
+  }
+
+  /**
+   * 创建测试文件
+   */
+  async createTestFile(uploadUserId: number, overrides: Partial<FileMt> = {}): Promise<FileMt> {
+    const fileRepository = this.dataSource.getRepository(FileMt);
+    const file = fileRepository.create({
+      tenantId: 1,
+      name: `test_file_${Math.floor(Math.random() * 100000)}.jpg`,
+      originalName: 'test.jpg',
+      path: '/uploads/test.jpg',
+      mimeType: 'image/jpeg',
+      size: 1024,
+      uploadUserId,
+      uploadTime: new Date(),
+      ...overrides
+    });
+    return await fileRepository.save(file);
+  }
+
+  /**
+   * 创建完整的测试环境（用户、供应商、商户、分类、商品）
+   */
+  async createFullTestEnvironment() {
+    const testUser = await this.createTestUser();
+    const testSupplier = await this.createTestSupplier(testUser.id);
+    const testMerchant = await this.createTestMerchant(testUser.id);
+    const testCategory = await this.createTestCategory(testUser.id);
+    const testGoods = await this.createTestGoods(testUser.id);
+
+    return {
+      testUser,
+      testSupplier,
+      testMerchant,
+      testCategory,
+      testGoods
+    };
+  }
+
+  /**
+   * 清理测试数据
+   */
+  async cleanup() {
+    const repositories = {
+      goods: this.dataSource.getRepository(GoodsMt),
+      category: this.dataSource.getRepository(GoodsCategoryMt),
+      supplier: this.dataSource.getRepository(SupplierMt),
+      merchant: this.dataSource.getRepository(MerchantMt),
+      user: this.dataSource.getRepository(UserEntityMt),
+      file: this.dataSource.getRepository(FileMt)
+    };
+
+    // 按依赖关系顺序删除数据
+    await repositories.goods.delete({});
+    await repositories.category.delete({});
+    await repositories.supplier.delete({});
+    await repositories.merchant.delete({});
+    await repositories.file.delete({});
+    await repositories.user.delete({});
+  }
+}

packages/goods-module-mt/tests/integration/admin-goods-categories.integration.test.ts

@@ -2,45 +2,33 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { testClient } from 'hono/testing';
 import { IntegrationTestDatabase, setupIntegrationDatabaseHooksWithEntities } from '@d8d/shared-test-util';
 import { JWTUtil } from '@d8d/shared-utils';
-import { UserEntityMt, Role } from '@d8d/user-module-mt';
+import { UserEntityMt, RoleMt } from '@d8d/user-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { adminGoodsCategoriesRoutesMt } from '../../src/routes/admin-goods-categories.mt';
-import { GoodsCategory } from '../../src/entities';
+import { GoodsCategoryMt } from '../../src/entities/index.mt';
+import { GoodsTestFactory } from '../factories/goods-test-factory';
 
 // 设置集成测试钩子
-setupIntegrationDatabaseHooksWithEntities([UserEntityMt, Role, GoodsCategory, File])
+setupIntegrationDatabaseHooksWithEntities([UserEntityMt, RoleMt, GoodsCategoryMt, FileMt])
 
 describe('管理员商品分类管理API集成测试', () => {
   let client: ReturnType<typeof testClient<typeof adminGoodsCategoriesRoutesMt>>;
   let adminToken: string;
   let testUser: UserEntityMt;
   let testAdmin: UserEntityMt;
+  let testFactory: GoodsTestFactory;
 
   beforeEach(async () => {
     // 创建测试客户端
     client = testClient(adminGoodsCategoriesRoutesMt);
 
-    // 获取数据源
+    // 获取数据源并创建测试工厂
     const dataSource = await IntegrationTestDatabase.getDataSource();
+    testFactory = new GoodsTestFactory(dataSource);
 
-    // 创建测试用户
-    const userRepository = dataSource.getRepository(UserEntityMt);
-    testUser = userRepository.create({
-      username: `test_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'test_password',
-      nickname: '测试用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testUser);
-
-    // 创建测试管理员用户
-    testAdmin = userRepository.create({
-      username: `test_admin_${Math.floor(Math.random() * 100000)}`,
-      password: 'admin_password',
-      nickname: '测试管理员',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testAdmin);
+    // 使用测试工厂创建测试数据
+    testUser = await testFactory.createTestUser();
+    testAdmin = await testFactory.createTestAdmin();
 
     // 生成测试管理员的token
     adminToken = JWTUtil.generateToken({
@@ -134,17 +122,10 @@ describe('管理员商品分类管理API集成测试', () => {
 
   describe('GET /goods-categories/:id', () => {
     it('应该返回指定商品分类的详情', async () => {
-      // 先创建一个商品分类
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const categoryRepository = dataSource.getRepository(GoodsCategory);
-      const testCategory = categoryRepository.create({
-        name: '测试商品分类详情',
-        parentId: 0,
-        level: 1,
-        state: 1,
-        createdBy: testUser.id
+      // 使用测试工厂创建一个商品分类
+      const testCategory = await testFactory.createTestCategory(testUser.id, {
+        name: '测试商品分类详情'
       });
-      await categoryRepository.save(testCategory);
 
       const response = await client[':id'].$get({
         param: { id: testCategory.id }
@@ -182,17 +163,10 @@ describe('管理员商品分类管理API集成测试', () => {
 
   describe('PUT /goods-categories/:id', () => {
     it('应该成功更新商品分类', async () => {
-      // 先创建一个商品分类
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const categoryRepository = dataSource.getRepository(GoodsCategory);
-      const testCategory = categoryRepository.create({
-        name: '测试更新商品分类',
-        parentId: 0,
-        level: 1,
-        state: 1,
-        createdBy: testUser.id
+      // 使用测试工厂创建一个商品分类
+      const testCategory = await testFactory.createTestCategory(testUser.id, {
+        name: '测试更新商品分类'
       });
-      await categoryRepository.save(testCategory);
 
       const updateData = {
         name: '更新后的商品分类名称',
@@ -223,8 +197,9 @@ describe('管理员商品分类管理API集成测试', () => {
     it('应该成功删除商品分类', async () => {
       // 先创建一个商品分类
       const dataSource = await IntegrationTestDatabase.getDataSource();
-      const categoryRepository = dataSource.getRepository(GoodsCategory);
+      const categoryRepository = dataSource.getRepository(GoodsCategoryMt);
       const testCategory = categoryRepository.create({
+        tenantId: 1,
         name: '测试删除商品分类',
         parentId: 0,
         level: 1,
@@ -248,38 +223,26 @@ describe('管理员商品分类管理API集成测试', () => {
 
   describe('商品分类树形结构测试', () => {
     it('应该支持多级分类结构', async () => {
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const categoryRepository = dataSource.getRepository(GoodsCategory);
-
       // 创建一级分类
-      const level1Category = categoryRepository.create({
+      const level1Category = await testFactory.createTestCategory(testUser.id, {
         name: '一级分类',
         parentId: 0,
-        level: 1,
-        state: 1,
-        createdBy: testUser.id
+        level: 1
       });
-      await categoryRepository.save(level1Category);
 
       // 创建二级分类
-      const level2Category = categoryRepository.create({
+      const level2Category = await testFactory.createTestCategory(testUser.id, {
         name: '二级分类',
         parentId: level1Category.id,
-        level: 2,
-        state: 1,
-        createdBy: testUser.id
+        level: 2
       });
-      await categoryRepository.save(level2Category);
 
       // 创建三级分类
-      const level3Category = categoryRepository.create({
+      const level3Category = await testFactory.createTestCategory(testUser.id, {
         name: '三级分类',
         parentId: level2Category.id,
-        level: 3,
-        state: 1,
-        createdBy: testUser.id
+        level: 3
       });
-      await categoryRepository.save(level3Category);
 
       // 验证分类层级关系
       const response = await client.index.$get({
@@ -306,28 +269,21 @@ describe('管理员商品分类管理API集成测试', () => {
 
   describe('商品分类状态管理测试', () => {
     it('应该正确处理分类状态变更', async () => {
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const categoryRepository = dataSource.getRepository(GoodsCategory);
-
       // 创建可用状态的分类
-      const activeCategory = categoryRepository.create({
+      const activeCategory = await testFactory.createTestCategory(testUser.id, {
         name: '可用分类',
         parentId: 0,
         level: 1,
-        state: 1,
-        createdBy: testUser.id
+        state: 1
       });
-      await categoryRepository.save(activeCategory);
 
       // 创建不可用状态的分类
-      const inactiveCategory = categoryRepository.create({
+      const inactiveCategory = await testFactory.createTestCategory(testUser.id, {
         name: '不可用分类',
         parentId: 0,
         level: 1,
-        state: 2,
-        createdBy: testUser.id
+        state: 2
       });
-      await categoryRepository.save(inactiveCategory);
 
       // 验证状态过滤
       const response = await client.index.$get({

packages/goods-module-mt/tests/integration/admin-goods-routes.integration.test.ts

@@ -2,52 +2,43 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { testClient } from 'hono/testing';
 import { IntegrationTestDatabase, setupIntegrationDatabaseHooksWithEntities } from '@d8d/shared-test-util';
 import { JWTUtil } from '@d8d/shared-utils';
-import { UserEntityMt, Role } from '@d8d/user-module-mt';
+import { UserEntityMt, RoleMt } from '@d8d/user-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { SupplierMt } from '@d8d/supplier-module-mt';
 import { MerchantMt } from '@d8d/merchant-module-mt';
-import { adminGoodsRoutes } from '../../src/routes';
-import { Goods, GoodsCategory } from '../../src/entities';
+import { adminGoodsRoutesMt } from '../../src/routes/index.mt';
+import { GoodsMt, GoodsCategoryMt } from '../../src/entities/index.mt';
+import { GoodsTestFactory } from '../factories/goods-test-factory';
 
 // 设置集成测试钩子
 setupIntegrationDatabaseHooksWithEntities([
-  UserEntityMt, Role, Goods, GoodsCategory, File, SupplierMt, MerchantMt
+  UserEntityMt, RoleMt, GoodsMt, GoodsCategoryMt, FileMt, SupplierMt, MerchantMt
 ])
 
 describe('管理员商品管理API集成测试', () => {
-  let client: ReturnType<typeof testClient<typeof adminGoodsRoutes>>;
+  let client: ReturnType<typeof testClient<typeof adminGoodsRoutesMt>>;
   let adminToken: string;
   let testUser: UserEntityMt;
   let testAdmin: UserEntityMt;
-  let testCategory: GoodsCategory;
+  let testCategory: GoodsCategoryMt;
   let testSupplier: SupplierMt;
   let testMerchant: MerchantMt;
+  let testFactory: GoodsTestFactory;
 
   beforeEach(async () => {
     // 创建测试客户端
-    client = testClient(adminGoodsRoutes);
+    client = testClient(adminGoodsRoutesMt);
 
-    // 获取数据源
+    // 获取数据源并创建测试工厂
     const dataSource = await IntegrationTestDatabase.getDataSource();
+    testFactory = new GoodsTestFactory(dataSource);
 
-    // 创建测试用户
-    const userRepository = dataSource.getRepository(UserEntityMt);
-    testUser = userRepository.create({
-      username: `test_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'test_password',
-      nickname: '测试用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testUser);
-
-    // 创建测试管理员用户
-    testAdmin = userRepository.create({
-      username: `test_admin_${Math.floor(Math.random() * 100000)}`,
-      password: 'admin_password',
-      nickname: '测试管理员',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testAdmin);
+    // 使用测试工厂创建测试数据
+    testUser = await testFactory.createTestUser();
+    testAdmin = await testFactory.createTestAdmin();
+    testCategory = await testFactory.createTestCategory(testUser.id);
+    testSupplier = await testFactory.createTestSupplier(testUser.id);
+    testMerchant = await testFactory.createTestMerchant(testUser.id);
 
     // 生成测试管理员的token
     adminToken = JWTUtil.generateToken({
@@ -55,84 +46,34 @@ describe('管理员商品管理API集成测试', () => {
       username: testAdmin.username,
       roles: [{name:'admin'}]
     });
-
-    // 创建测试商品分类
-    const categoryRepository = dataSource.getRepository(GoodsCategory);
-    testCategory = categoryRepository.create({
-      name: '测试分类',
-      parentId: 0,
-      level: 1,
-      state: 1,
-      createdBy: testUser.id
-    });
-    await categoryRepository.save(testCategory);
-
-    // 创建测试供应商
-    const supplierRepository = dataSource.getRepository(SupplierMt);
-    testSupplier = supplierRepository.create({
-      name: '测试供应商',
-      username: `test_supplier_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138000',
-      realname: '测试供应商',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await supplierRepository.save(testSupplier);
-
-    // 创建测试商户
-    const merchantRepository = dataSource.getRepository(MerchantMt);
-    testMerchant = merchantRepository.create({
-      name: '测试商户',
-      username: `test_merchant_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138001',
-      realname: '测试商户',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await merchantRepository.save(testMerchant);
   });
 
   describe('GET /goods', () => {
     it('应该返回所有商品列表', async () => {
       // 创建多个用户的商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
-      const userGoods1 = goodsRepository.create({
+      const userGoods1 = await testFactory.createTestGoods(testUser.id, {
         name: '用户商品1',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(userGoods1);
 
-      const userGoods2 = goodsRepository.create({
+      const userGoods2 = await testFactory.createTestGoods(testAdmin.id, {
         name: '用户商品2',
         price: 200.00,
         costPrice: 160.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 50,
-        lowestBuy: 1,
-        createdBy: testAdmin.id
+        stock: 50
       });
-      await goodsRepository.save(userGoods2);
 
       const response = await client.index.$get({
         query: {}
@@ -232,24 +173,17 @@ describe('管理员商品管理API集成测试', () => {
   describe('GET /goods/:id', () => {
     it('应该返回指定商品的详情', async () => {
       // 先创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试商品详情',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(testGoods);
 
       const response = await client[':id'].$get({
         param: { id: testGoods.id }
@@ -286,24 +220,17 @@ describe('管理员商品管理API集成测试', () => {
   describe('PUT /goods/:id', () => {
     it('应该成功更新任何商品', async () => {
       // 先创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试更新商品',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(testGoods);
 
       const updateData = {
         name: '管理员更新后的商品名称',
@@ -337,24 +264,17 @@ describe('管理员商品管理API集成测试', () => {
   describe('DELETE /goods/:id', () => {
     it('应该成功删除任何商品', async () => {
       // 先创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试删除商品',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(testGoods);
 
       const response = await client[':id'].$delete({
         param: { id: testGoods.id }
@@ -371,44 +291,33 @@ describe('管理员商品管理API集成测试', () => {
 
   describe('商品状态管理测试', () => {
     it('应该正确处理商品状态变更', async () => {
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
       // 创建可用状态的商品
-      const activeGoods = goodsRepository.create({
+      const activeGoods = await testFactory.createTestGoods(testUser.id, {
         name: '可用商品',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
         state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(activeGoods);
 
       // 创建不可用状态的商品
-      const inactiveGoods = goodsRepository.create({
+      const inactiveGoods = await testFactory.createTestGoods(testUser.id, {
         name: '不可用商品',
         price: 200.00,
         costPrice: 160.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
         state: 2,
-        stock: 50,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 50
       });
-      await goodsRepository.save(inactiveGoods);
 
       // 验证状态过滤
       const response = await client.index.$get({
@@ -439,26 +348,18 @@ describe('管理员商品管理API集成测试', () => {
 
   describe('商品库存管理测试', () => {
     it('应该正确处理商品库存更新', async () => {
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
       // 创建一个商品
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '库存测试商品',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(testGoods);
 
       // 更新库存
       const updateData = {
@@ -485,43 +386,30 @@ describe('管理员商品管理API集成测试', () => {
 
   describe('管理员权限验证测试', () => {
     it('应该验证管理员可以访问所有数据', async () => {
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
       // 创建多个用户的商品
-      const userGoods = goodsRepository.create({
+      const userGoods = await testFactory.createTestGoods(testUser.id, {
         name: '用户商品',
         price: 100.00,
         costPrice: 80.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        stock: 100
       });
-      await goodsRepository.save(userGoods);
 
-      const adminGoods = goodsRepository.create({
+      const adminGoods = await testFactory.createTestGoods(testAdmin.id, {
         name: '管理员商品',
         price: 200.00,
         costPrice: 160.00,
         categoryId1: testCategory.id,
         categoryId2: testCategory.id,
         categoryId3: testCategory.id,
-        goodsType: 1,
         supplierId: testSupplier.id,
         merchantId: testMerchant.id,
-        state: 1,
-        stock: 50,
-        lowestBuy: 1,
-        createdBy: testAdmin.id
+        stock: 50
       });
-      await goodsRepository.save(adminGoods);
 
       // 使用管理员token获取列表
       const response = await client.index.$get({

packages/goods-module-mt/tests/integration/public-goods-random.integration.test.ts

@@ -2,16 +2,17 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { testClient } from 'hono/testing';
 import { IntegrationTestDatabase, setupIntegrationDatabaseHooksWithEntities } from '@d8d/shared-test-util';
 import { JWTUtil } from '@d8d/shared-utils';
-import { UserEntityMt, Role } from '@d8d/user-module-mt';
+import { UserEntityMt, RoleMt } from '@d8d/user-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { SupplierMt } from '@d8d/supplier-module-mt';
 import { MerchantMt } from '@d8d/merchant-module-mt';
 import { publicGoodsRandomRoutesMt } from '../../src/routes/public-goods-random.mt';
-import { Goods, GoodsCategory } from '../../src/entities';
+import { GoodsMt, GoodsCategoryMt } from '../../src/entities/index.mt';
+import { GoodsTestFactory } from '../factories/goods-test-factory';
 
 // 设置集成测试钩子
 setupIntegrationDatabaseHooksWithEntities([
-  UserEntityMt, Role, Goods, GoodsCategory, File, SupplierMt, MerchantMt
+  UserEntityMt, RoleMt, GoodsMt, GoodsCategoryMt, FileMt, SupplierMt, MerchantMt
 ])
 
 describe('公开随机商品API集成测试', () => {
@@ -19,111 +20,54 @@ describe('公开随机商品API集成测试', () => {
   let testUser: UserEntityMt;
   let testSupplier: SupplierMt;
   let testMerchant: MerchantMt;
-  let testCategory1: GoodsCategory;
-  let testCategory2: GoodsCategory;
+  let testCategory1: GoodsCategoryMt;
+  let testCategory2: GoodsCategoryMt;
+  let testFactory: GoodsTestFactory;
 
   beforeEach(async () => {
     // 创建测试客户端
     client = testClient(publicGoodsRandomRoutesMt);
 
-    // 获取数据源
+    // 获取数据源并创建测试工厂
     const dataSource = await IntegrationTestDatabase.getDataSource();
+    testFactory = new GoodsTestFactory(dataSource);
 
-    // 创建测试用户
-    const userRepository = dataSource.getRepository(UserEntityMt);
-    testUser = userRepository.create({
-      username: `test_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'test_password',
-      nickname: '测试用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testUser);
-
-    // 创建测试供应商
-    const supplierRepository = dataSource.getRepository(SupplierMt);
-    testSupplier = supplierRepository.create({
-      name: '测试供应商',
-      username: `test_supplier_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138000',
-      realname: '测试供应商',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await supplierRepository.save(testSupplier);
-
-    // 创建测试商户
-    const merchantRepository = dataSource.getRepository(MerchantMt);
-    testMerchant = merchantRepository.create({
-      name: '测试商户',
-      username: `test_merchant_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138001',
-      realname: '测试商户',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await merchantRepository.save(testMerchant);
-
-    // 创建测试商品分类
-    const categoryRepository = dataSource.getRepository(GoodsCategory);
-    testCategory1 = categoryRepository.create({
-      name: '测试分类1',
-      parentId: 0,
-      level: 1,
-      state: 1,
-      createdBy: testUser.id
-    });
-    await categoryRepository.save(testCategory1);
-
-    testCategory2 = categoryRepository.create({
-      name: '测试分类2',
-      parentId: 0,
-      level: 1,
-      state: 1,
-      createdBy: testUser.id
-    });
-    await categoryRepository.save(testCategory2);
+    // 使用测试工厂创建测试数据
+    testUser = await testFactory.createTestUser();
+    testSupplier = await testFactory.createTestSupplier(testUser.id);
+    testMerchant = await testFactory.createTestMerchant(testUser.id);
+    testCategory1 = await testFactory.createTestCategory(testUser.id, { name: '测试分类1' });
+    testCategory2 = await testFactory.createTestCategory(testUser.id, { name: '测试分类2' });
 
     // 创建测试商品
-    const goodsRepository = dataSource.getRepository(Goods);
-
     // 创建可用状态的商品
-    const activeGoods1 = goodsRepository.create({
+    const activeGoods1 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品1',
       price: 100.00,
       costPrice: 80.00,
       categoryId1: testCategory1.id,
       categoryId2: testCategory1.id,
       categoryId3: testCategory1.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 100,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 100
     });
-    await goodsRepository.save(activeGoods1);
 
-    const activeGoods2 = goodsRepository.create({
+    const activeGoods2 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品2',
       price: 200.00,
       costPrice: 160.00,
       categoryId1: testCategory2.id,
       categoryId2: testCategory2.id,
       categoryId3: testCategory2.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 50,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 50
     });
-    await goodsRepository.save(activeGoods2);
 
-    const activeGoods3 = goodsRepository.create({
+    const activeGoods3 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品3',
       price: 300.00,
       costPrice: 240.00,
@@ -134,29 +78,22 @@ describe('公开随机商品API集成测试', () => {
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 30,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 30
     });
-    await goodsRepository.save(activeGoods3);
 
     // 创建不可用状态的商品（不应该被随机查询返回）
-    const inactiveGoods = goodsRepository.create({
+    const inactiveGoods = await testFactory.createTestGoods(testUser.id, {
       name: '不可用商品',
       price: 400.00,
       costPrice: 320.00,
       categoryId1: testCategory1.id,
       categoryId2: testCategory1.id,
       categoryId3: testCategory1.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 2,
-      stock: 10,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 10
     });
-    await goodsRepository.save(inactiveGoods);
   });
 
   describe('GET /goods/random', () => {

packages/goods-module-mt/tests/integration/public-goods-routes.integration.test.ts

@@ -2,118 +2,70 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { testClient } from 'hono/testing';
 import { IntegrationTestDatabase, setupIntegrationDatabaseHooksWithEntities } from '@d8d/shared-test-util';
 import { JWTUtil } from '@d8d/shared-utils';
-import { UserEntityMt, Role } from '@d8d/user-module-mt';
+import { UserEntityMt, RoleMt } from '@d8d/user-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { SupplierMt } from '@d8d/supplier-module-mt';
 import { MerchantMt } from '@d8d/merchant-module-mt';
-import { publicGoodsRoutes } from '../../src/routes';
-import { Goods, GoodsCategory } from '../../src/entities';
+import { publicGoodsRoutesMt } from '../../src/routes/index.mt';
+import { GoodsMt, GoodsCategoryMt } from '../../src/entities/index.mt';
+import { GoodsTestFactory } from '../factories/goods-test-factory';
 
 // 设置集成测试钩子
 setupIntegrationDatabaseHooksWithEntities([
-  UserEntityMt, Role, Goods, GoodsCategory, File, SupplierMt, MerchantMt
+  UserEntityMt, RoleMt, GoodsMt, GoodsCategoryMt, FileMt, SupplierMt, MerchantMt
 ])
 
 describe('公开商品API集成测试', () => {
-  let client: ReturnType<typeof testClient<typeof publicGoodsRoutes>>;
+  let client: ReturnType<typeof testClient<typeof publicGoodsRoutesMt>>;
   let testUser: UserEntityMt;
-  let testCategory: GoodsCategory;
+  let testCategory: GoodsCategoryMt;
   let testSupplier: SupplierMt;
   let testMerchant: MerchantMt;
+  let testFactory: GoodsTestFactory;
 
   beforeEach(async () => {
     // 创建测试客户端
-    client = testClient(publicGoodsRoutes);
+    client = testClient(publicGoodsRoutesMt);
 
-    // 获取数据源
+    // 获取数据源并创建测试工厂
     const dataSource = await IntegrationTestDatabase.getDataSource();
+    testFactory = new GoodsTestFactory(dataSource);
 
-    // 创建测试用户
-    const userRepository = dataSource.getRepository(UserEntityMt);
-    testUser = userRepository.create({
-      username: `test_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'test_password',
-      nickname: '测试用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testUser);
-
-    // 创建测试商品分类
-    const categoryRepository = dataSource.getRepository(GoodsCategory);
-    testCategory = categoryRepository.create({
-      name: '测试分类',
-      parentId: 0,
-      level: 1,
-      state: 1,
-      createdBy: testUser.id
-    });
-    await categoryRepository.save(testCategory);
-
-    // 创建测试供应商
-    const supplierRepository = dataSource.getRepository(SupplierMt);
-    testSupplier = supplierRepository.create({
-      name: '测试供应商',
-      username: `test_supplier_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138000',
-      realname: '测试供应商',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await supplierRepository.save(testSupplier);
-
-    // 创建测试商户
-    const merchantRepository = dataSource.getRepository(MerchantMt);
-    testMerchant = merchantRepository.create({
-      name: '测试商户',
-      username: `test_merchant_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138001',
-      realname: '测试商户',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await merchantRepository.save(testMerchant);
+    // 使用测试工厂创建测试数据
+    testUser = await testFactory.createTestUser();
+    testCategory = await testFactory.createTestCategory(testUser.id);
+    testSupplier = await testFactory.createTestSupplier(testUser.id);
+    testMerchant = await testFactory.createTestMerchant(testUser.id);
 
     // 创建测试商品
-    const goodsRepository = dataSource.getRepository(Goods);
-
     // 创建可用状态的商品
-    const activeGoods1 = goodsRepository.create({
+    const activeGoods1 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品1',
       price: 100.00,
       costPrice: 80.00,
       categoryId1: testCategory.id,
       categoryId2: testCategory.id,
       categoryId3: testCategory.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 100,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 100
     });
-    await goodsRepository.save(activeGoods1);
 
-    const activeGoods2 = goodsRepository.create({
+    const activeGoods2 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品2',
       price: 200.00,
       costPrice: 160.00,
       categoryId1: testCategory.id,
       categoryId2: testCategory.id,
       categoryId3: testCategory.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 50,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 50
     });
-    await goodsRepository.save(activeGoods2);
 
-    const activeGoods3 = goodsRepository.create({
+    const activeGoods3 = await testFactory.createTestGoods(testUser.id, {
       name: '可用商品3',
       price: 300.00,
       costPrice: 240.00,
@@ -124,29 +76,22 @@ describe('公开商品API集成测试', () => {
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 1,
-      stock: 30,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 30
     });
-    await goodsRepository.save(activeGoods3);
 
     // 创建不可用状态的商品（不应该被公开路由返回）
-    const inactiveGoods = goodsRepository.create({
+    const inactiveGoods = await testFactory.createTestGoods(testUser.id, {
       name: '不可用商品',
       price: 400.00,
       costPrice: 320.00,
       categoryId1: testCategory.id,
       categoryId2: testCategory.id,
       categoryId3: testCategory.id,
-      goodsType: 1,
       supplierId: testSupplier.id,
       merchantId: testMerchant.id,
       state: 2,
-      stock: 10,
-      lowestBuy: 1,
-      createdBy: testUser.id
+      stock: 10
     });
-    await goodsRepository.save(inactiveGoods);
   });
 
   describe('GET /goods', () => {
@@ -263,7 +208,7 @@ describe('公开商品API集成测试', () => {
     it('应该返回指定商品的详情', async () => {
       // 先获取一个可用商品的ID
       const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
+      const goodsRepository = dataSource.getRepository(GoodsMt);
       const activeGoods = await goodsRepository.findOne({
         where: { state: 1 }
       });
@@ -288,7 +233,7 @@ describe('公开商品API集成测试', () => {
     it('应该拒绝访问不可用状态的商品', async () => {
       // 先获取一个不可用商品的ID
       const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
+      const goodsRepository = dataSource.getRepository(GoodsMt);
       const inactiveGoods = await goodsRepository.findOne({
         where: { state: 2 }
       });
@@ -332,7 +277,7 @@ describe('公开商品API集成测试', () => {
     it('应该拒绝更新商品操作', async () => {
       // 先获取一个可用商品的ID
       const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
+      const goodsRepository = dataSource.getRepository(GoodsMt);
       const activeGoods = await goodsRepository.findOne({
         where: { state: 1 }
       });
@@ -356,7 +301,7 @@ describe('公开商品API集成测试', () => {
     it('应该拒绝删除商品操作', async () => {
       // 先获取一个可用商品的ID
       const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
+      const goodsRepository = dataSource.getRepository(GoodsMt);
       const activeGoods = await goodsRepository.findOne({
         where: { state: 1 }
       });

packages/goods-module-mt/tests/integration/user-goods-routes.integration.test.ts

@@ -2,54 +2,45 @@ import { describe, it, expect, beforeEach } from 'vitest';
 import { testClient } from 'hono/testing';
 import { IntegrationTestDatabase, setupIntegrationDatabaseHooksWithEntities } from '@d8d/shared-test-util';
 import { JWTUtil } from '@d8d/shared-utils';
-import { UserEntityMt, Role } from '@d8d/user-module-mt';
+import { UserEntityMt, RoleMt } from '@d8d/user-module-mt';
 import { FileMt } from '@d8d/file-module-mt';
 import { SupplierMt } from '@d8d/supplier-module-mt';
 import { MerchantMt } from '@d8d/merchant-module-mt';
-import { userGoodsRoutes } from '../../src/routes';
-import { Goods, GoodsCategory } from '../../src/entities';
+import { userGoodsRoutesMt } from '../../src/routes/index.mt';
+import { GoodsMt, GoodsCategoryMt } from '../../src/entities/index.mt';
+import { GoodsTestFactory } from '../factories/goods-test-factory';
 
 // 设置集成测试钩子
 setupIntegrationDatabaseHooksWithEntities([
-  UserEntityMt, Role, Goods, GoodsCategory, File, SupplierMt, MerchantMt
+  UserEntityMt, RoleMt, GoodsMt, GoodsCategoryMt, FileMt, SupplierMt, MerchantMt
 ])
 
 describe('用户商品管理API集成测试', () => {
-  let client: ReturnType<typeof testClient<typeof userGoodsRoutes>>;
+  let client: ReturnType<typeof testClient<typeof userGoodsRoutesMt>>;
   let userToken: string;
   let otherUserToken: string;
   let testUser: UserEntityMt;
   let otherUser: UserEntityMt;
-  let testCategory: GoodsCategory;
+  let testCategory: GoodsCategoryMt;
   let testSupplier: SupplierMt;
   let testMerchant: MerchantMt;
-  let testFile: File;
+  let testFile: FileMt;
+  let testFactory: GoodsTestFactory;
 
   beforeEach(async () => {
     // 创建测试客户端
-    client = testClient(userGoodsRoutes);
+    client = testClient(userGoodsRoutesMt);
 
-    // 获取数据源
+    // 获取数据源并创建测试工厂
     const dataSource = await IntegrationTestDatabase.getDataSource();
+    testFactory = new GoodsTestFactory(dataSource);
 
-    // 创建测试用户
-    const userRepository = dataSource.getRepository(UserEntityMt);
-    testUser = userRepository.create({
-      username: `test_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'test_password',
-      nickname: '测试用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(testUser);
-
-    // 创建其他用户
-    otherUser = userRepository.create({
-      username: `other_user_${Math.floor(Math.random() * 100000)}`,
-      password: 'other_password',
-      nickname: '其他用户',
-      registrationSource: 'web'
-    });
-    await userRepository.save(otherUser);
+    // 使用测试工厂创建测试数据
+    testUser = await testFactory.createTestUser();
+    otherUser = await testFactory.createTestUser({ nickname: '其他用户' });
+    testCategory = await testFactory.createTestCategory(testUser.id);
+    testSupplier = await testFactory.createTestSupplier(testUser.id);
+    testMerchant = await testFactory.createTestMerchant(testUser.id);
 
     // 生成测试用户的token
     userToken = JWTUtil.generateToken({
@@ -65,65 +56,14 @@ describe('用户商品管理API集成测试', () => {
       roles: [{name:'user'}]
     });
 
-    // 创建测试商品分类
-    const categoryRepository = dataSource.getRepository(GoodsCategory);
-    testCategory = categoryRepository.create({
-      name: '测试分类',
-      parentId: 0,
-      level: 1,
-      state: 1,
-      createdBy: testUser.id
-    });
-    await categoryRepository.save(testCategory);
-
-    // 创建测试供应商
-    const supplierRepository = dataSource.getRepository(SupplierMt);
-    testSupplier = supplierRepository.create({
-      name: '测试供应商',
-      username: `test_supplier_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138000',
-      realname: '测试供应商',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await supplierRepository.save(testSupplier);
-
-    // 创建测试商户
-    const merchantRepository = dataSource.getRepository(MerchantMt);
-    testMerchant = merchantRepository.create({
-      name: '测试商户',
-      username: `test_merchant_${Math.floor(Math.random() * 100000)}`,
-      password: 'password123',
-      phone: '13800138001',
-      realname: '测试商户',
-      state: 1,
-      createdBy: testUser.id
-    });
-    await merchantRepository.save(testMerchant);
-
     // 创建测试文件
-    const fileRepository = dataSource.getRepository(File);
-    testFile = fileRepository.create({
-      name: 'test_image.jpg',
-      type: 'image/jpeg',
-      size: 102400,
-      path: 'images/test_image.jpg',
-      uploadUserId: testUser.id,
-      uploadTime: new Date(),
-      createdAt: new Date(),
-      updatedAt: new Date()
-    });
-    await fileRepository.save(testFile);
+    testFile = await testFactory.createTestFile(testUser.id);
   });
 
   describe('GET /goods', () => {
     it('应该返回当前用户的商品列表', async () => {
       // 为测试用户创建一些商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
-      const userGoods1 = goodsRepository.create({
+      const userGoods1 = await testFactory.createTestGoods(testUser.id, {
         name: '用户商品1',
         price: 100.00,
         costPrice: 80.00,
@@ -136,12 +76,10 @@ describe('用户商品管理API集成测试', () => {
         imageFileId: testFile.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(userGoods1);
 
-      const userGoods2 = goodsRepository.create({
+      const userGoods2 = await testFactory.createTestGoods(testUser.id, {
         name: '用户商品2',
         price: 200.00,
         costPrice: 160.00,
@@ -154,13 +92,11 @@ describe('用户商品管理API集成测试', () => {
         imageFileId: testFile.id,
         state: 1,
         stock: 50,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(userGoods2);
 
       // 为其他用户创建一个商品，确保不会返回
-      const otherUserGoods = goodsRepository.create({
+      const otherUserGoods = await testFactory.createTestGoods(otherUser.id, {
         name: '其他用户商品',
         price: 300.00,
         costPrice: 240.00,
@@ -173,10 +109,8 @@ describe('用户商品管理API集成测试', () => {
         imageFileId: testFile.id,
         state: 1,
         stock: 30,
-        lowestBuy: 1,
-        createdBy: otherUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(otherUserGoods);
 
       const response = await client.index.$get({
         query: {
@@ -287,9 +221,7 @@ describe('用户商品管理API集成测试', () => {
   describe('GET /goods/:id', () => {
     it('应该返回当前用户的商品详情', async () => {
       // 先为测试用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试用户商品详情',
         price: 100.00,
         costPrice: 80.00,
@@ -301,10 +233,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(testGoods);
 
       const response = await client[':id'].$get({
         param: { id: testGoods.id }
@@ -331,9 +261,7 @@ describe('用户商品管理API集成测试', () => {
 
     it('应该拒绝访问其他用户的商品', async () => {
       // 为其他用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const otherUserGoods = goodsRepository.create({
+      const otherUserGoods = await testFactory.createTestGoods(otherUser.id, {
         name: '其他用户商品',
         price: 100.00,
         costPrice: 80.00,
@@ -345,10 +273,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: otherUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(otherUserGoods);
 
       const response = await client[':id'].$get({
         param: { id: otherUserGoods.id }
@@ -358,7 +284,7 @@ describe('用户商品管理API集成测试', () => {
         }
       });
 
-      expect(response.status).toBe(403); // 数据权限控制返回403（权限不足）
+      expect(response.status).toBe(404); // 数据权限控制返回404（未找到，安全考虑）
     });
 
     it('应该处理不存在的商品', async () => {
@@ -377,9 +303,7 @@ describe('用户商品管理API集成测试', () => {
   describe('PUT /goods/:id', () => {
     it('应该成功更新当前用户的商品', async () => {
       // 先为测试用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试更新商品',
         price: 100.00,
         costPrice: 80.00,
@@ -391,10 +315,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(testGoods);
 
       const updateData = {
         name: '更新后的商品名称',
@@ -425,9 +347,7 @@ describe('用户商品管理API集成测试', () => {
 
     it('应该拒绝更新其他用户的商品', async () => {
       // 为其他用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const otherUserGoods = goodsRepository.create({
+      const otherUserGoods = await testFactory.createTestGoods(otherUser.id, {
         name: '其他用户商品',
         price: 100.00,
         costPrice: 80.00,
@@ -439,10 +359,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: otherUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(otherUserGoods);
 
       const updateData = {
         name: '尝试更新其他用户商品'
@@ -464,9 +382,7 @@ describe('用户商品管理API集成测试', () => {
   describe('DELETE /goods/:id', () => {
     it('应该成功删除当前用户的商品', async () => {
       // 先为测试用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const testGoods = goodsRepository.create({
+      const testGoods = await testFactory.createTestGoods(testUser.id, {
         name: '测试删除商品',
         price: 100.00,
         costPrice: 80.00,
@@ -478,10 +394,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(testGoods);
 
       const response = await client[':id'].$delete({
         param: { id: testGoods.id }
@@ -497,9 +411,7 @@ describe('用户商品管理API集成测试', () => {
 
     it('应该拒绝删除其他用户的商品', async () => {
       // 为其他用户创建一个商品
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-      const otherUserGoods = goodsRepository.create({
+      const otherUserGoods = await testFactory.createTestGoods(otherUser.id, {
         name: '其他用户商品',
         price: 100.00,
         costPrice: 80.00,
@@ -511,10 +423,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: otherUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(otherUserGoods);
 
       const response = await client[':id'].$delete({
         param: { id: otherUserGoods.id }
@@ -533,11 +443,8 @@ describe('用户商品管理API集成测试', () => {
       // 这个测试验证数据权限配置是否正常工作
       // 用户只能访问自己创建的商品
 
-      const dataSource = await IntegrationTestDatabase.getDataSource();
-      const goodsRepository = dataSource.getRepository(Goods);
-
       // 创建测试用户和其他用户的商品
-      const userGoods = goodsRepository.create({
+      const userGoods = await testFactory.createTestGoods(testUser.id, {
         name: '用户商品',
         price: 100.00,
         costPrice: 80.00,
@@ -549,12 +456,10 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 100,
-        lowestBuy: 1,
-        createdBy: testUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(userGoods);
 
-      const otherUserGoods = goodsRepository.create({
+      const otherUserGoods = await testFactory.createTestGoods(otherUser.id, {
         name: '其他用户商品',
         price: 200.00,
         costPrice: 160.00,
@@ -566,10 +471,8 @@ describe('用户商品管理API集成测试', () => {
         merchantId: testMerchant.id,
         state: 1,
         stock: 50,
-        lowestBuy: 1,
-        createdBy: otherUser.id
+        lowestBuy: 1
       });
-      await goodsRepository.save(otherUserGoods);
 
       // 使用测试用户token获取列表
       const response = await client.index.$get({