feat: 实现门店套餐分配功能并统一测试基础设施

新增功能：
- 门店套餐分配管理（shop_package_allocation）：支持门店套餐库存管理
- 门店套餐系列分配管理（shop_series_allocation）：支持套餐系列分配和佣金层级设置
- 我的套餐查询（my_package）：支持门店查询自己的套餐分配情况

测试改进：
- 统一集成测试基础设施，新增 testutils.NewIntegrationTestEnv
- 重构所有集成测试使用新的测试环境设置
- 移除旧的测试辅助函数和冗余测试文件
- 新增 test_helpers_test.go 统一任务测试辅助

技术细节：
- 新增数据库迁移 000025_create_shop_allocation_tables
- 新增 3 个 Handler、Service、Store 和对应的单元测试
- 更新 OpenAPI 文档和文档生成器
- 测试覆盖率：Service 层 > 90%

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>

tests/integration/shop_management_test.go

@@ -1,151 +1,31 @@
 package integration
 
 import (
-	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
-	"net/http/httptest"
 	"testing"
 	"time"
 
-	"github.com/break/junhong_cmp_fiber/internal/bootstrap"
-	"github.com/break/junhong_cmp_fiber/internal/model"
 	"github.com/break/junhong_cmp_fiber/internal/model/dto"
-	"github.com/break/junhong_cmp_fiber/internal/routes"
-	"github.com/break/junhong_cmp_fiber/pkg/auth"
-	"github.com/break/junhong_cmp_fiber/pkg/config"
 	"github.com/break/junhong_cmp_fiber/pkg/response"
-	"github.com/break/junhong_cmp_fiber/tests/testutil"
 	"github.com/break/junhong_cmp_fiber/tests/testutils"
-	"github.com/gofiber/fiber/v2"
-	"github.com/redis/go-redis/v9"
+	"github.com/break/junhong_cmp_fiber/tests/testutils/integ"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"go.uber.org/zap"
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
 )
 
-// shopManagementTestEnv 商户管理测试环境
-type shopManagementTestEnv struct {
-	tx             *gorm.DB
-	rdb            *redis.Client
-	tokenManager   *auth.TokenManager
-	app            *fiber.App
-	adminToken     string
-	superAdminUser *model.Account
-	t              *testing.T
-}
-
-// setupShopManagementTestEnv 设置商户管理测试环境
-func setupShopManagementTestEnv(t *testing.T) *shopManagementTestEnv {
-	t.Helper()
-
-	t.Setenv("CONFIG_ENV", "dev")
-	t.Setenv("CONFIG_PATH", "../../configs/config.dev.yaml")
-	cfg, err := config.Load()
-	require.NoError(t, err)
-	err = config.Set(cfg)
-	require.NoError(t, err)
-
-	zapLogger, _ := zap.NewDevelopment()
-
-	dsn := "host=cxd.whcxd.cn port=16159 user=erp_pgsql password=erp_2025 dbname=junhong_cmp_test sslmode=disable TimeZone=Asia/Shanghai"
-	tx, err := gorm.Open(postgres.Open(dsn), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	require.NoError(t, err)
-
-	err = tx.AutoMigrate(
-		&model.Account{},
-		&model.Role{},
-		&model.Permission{},
-		&model.AccountRole{},
-		&model.RolePermission{},
-		&model.Shop{},
-		&model.Enterprise{},
-		&model.PersonalCustomer{},
-	)
-	require.NoError(t, err)
-
-	rdb := redis.NewClient(&redis.Options{
-		Addr:     "cxd.whcxd.cn:16299",
-		Password: "cpNbWtAaqgo1YJmbMp3h",
-		DB:       15,
-	})
-
-	ctx := context.Background()
-	err = rdb.Ping(ctx).Err()
-	require.NoError(t, err)
-
-	testPrefix := fmt.Sprintf("test:%s:", t.Name())
-	keys, _ := rdb.Keys(ctx, testPrefix+"*").Result()
-	if len(keys) > 0 {
-		rdb.Del(ctx, keys...)
-	}
-
-	tokenManager := auth.NewTokenManager(rdb, 24*time.Hour, 7*24*time.Hour)
-
-	superAdmin := testutil.CreateSuperAdmin(t, tx)
-	adminToken, _ := testutil.GenerateTestToken(t, rdb, superAdmin, "web")
-
-	deps := &bootstrap.Dependencies{
-		DB:           tx,
-		Redis:        rdb,
-		Logger:       zapLogger,
-		TokenManager: tokenManager,
-	}
-
-	result, err := bootstrap.Bootstrap(deps)
-	require.NoError(t, err)
-
-	handlers := result.Handlers
-	middlewares := result.Middlewares
-
-	app := fiber.New(fiber.Config{
-		ErrorHandler: func(c *fiber.Ctx, err error) error {
-			return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{"error": err.Error()})
-		},
-	})
-
-	routes.RegisterRoutes(app, handlers, middlewares)
-
-	return &shopManagementTestEnv{
-		tx:             tx,
-		rdb:            rdb,
-		tokenManager:   tokenManager,
-		app:            app,
-		adminToken:     adminToken,
-		superAdminUser: superAdmin,
-		t:              t,
-	}
-}
-
-// teardown 清理测试环境
-func (e *shopManagementTestEnv) teardown() {
-	e.tx.Exec("DELETE FROM tb_account WHERE username LIKE 'test%' OR username LIKE 'agent%' OR username LIKE 'superadmin%'")
-	e.tx.Exec("DELETE FROM tb_shop WHERE shop_code LIKE 'TEST%' OR shop_code LIKE 'DUP%' OR shop_code LIKE 'SHOP_%' OR shop_code LIKE 'ORIG%' OR shop_code LIKE 'DEL%' OR shop_code LIKE 'MULTI%'")
-
-	ctx := context.Background()
-	testPrefix := fmt.Sprintf("test:%s:", e.t.Name())
-	keys, _ := e.rdb.Keys(ctx, testPrefix+"*").Result()
-	if len(keys) > 0 {
-		e.rdb.Del(ctx, keys...)
-	}
-
-	e.rdb.Close()
-}
-
 // TestShopManagement_CreateShop 测试创建商户
 func TestShopManagement_CreateShop(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
+
+	// 使用时间戳生成唯一的店铺名和代码
+	timestamp := time.Now().UnixNano()
+	shopName := fmt.Sprintf("test_shop_%d", timestamp)
+	shopCode := fmt.Sprintf("SHOP%d", timestamp%1000000)
 
 	reqBody := dto.CreateShopRequest{
-		ShopName:     "测试商户",
-		ShopCode:     "TEST001",
+		ShopName:     shopName,
+		ShopCode:     shopCode,
 		InitUsername: "testuser",
 		InitPhone:    testutils.GenerateUniquePhone(),
 		InitPassword: "password123",
@@ -154,11 +34,7 @@ func TestShopManagement_CreateShop(t *testing.T) {
 	body, err := json.Marshal(reqBody)
 	require.NoError(t, err)
 
-	req := httptest.NewRequest("POST", "/api/admin/shops", bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", body)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -181,29 +57,29 @@ func TestShopManagement_CreateShop(t *testing.T) {
 
 	shopData, ok := result.Data.(map[string]interface{})
 	require.True(t, ok)
-	assert.Equal(t, "测试商户", shopData["shop_name"])
-	assert.Equal(t, "TEST001", shopData["shop_code"])
+	assert.Equal(t, shopName, shopData["shop_name"])
+	assert.Equal(t, shopCode, shopData["shop_code"])
 	assert.Equal(t, float64(1), shopData["level"])
 	assert.Equal(t, float64(1), shopData["status"])
 }
 
 // TestShopManagement_CreateShop_DuplicateCode 测试创建商户 - 商户编码重复
 func TestShopManagement_CreateShop_DuplicateCode(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
+
+	// 使用时间戳生成唯一的店铺代码
+	timestamp := time.Now().UnixNano()
+	duplicateCode := fmt.Sprintf("DUP%d", timestamp%1000000)
 
 	firstReq := dto.CreateShopRequest{
-		ShopName:     "商户1",
-		ShopCode:     "DUP001",
-		InitUsername: "dupuser1",
+		ShopName:     fmt.Sprintf("shop1_%d", timestamp),
+		ShopCode:     duplicateCode,
+		InitUsername: fmt.Sprintf("dupuser1_%d", timestamp),
 		InitPhone:    testutils.GenerateUniquePhone(),
 		InitPassword: "password123",
 	}
 	firstBody, _ := json.Marshal(firstReq)
-	firstHttpReq := httptest.NewRequest("POST", "/api/admin/shops", bytes.NewReader(firstBody))
-	firstHttpReq.Header.Set("Content-Type", "application/json")
-	firstHttpReq.Header.Set("Authorization", "Bearer "+env.adminToken)
-	firstResp, _ := env.app.Test(firstHttpReq, -1)
+	firstResp, _ := env.AsSuperAdmin().Request("POST", "/api/admin/shops", firstBody)
 	var firstResult response.Response
 	json.NewDecoder(firstResp.Body).Decode(&firstResult)
 	firstResp.Body.Close()
@@ -211,9 +87,9 @@ func TestShopManagement_CreateShop_DuplicateCode(t *testing.T) {
 	require.Equal(t, 0, firstResult.Code, "第一个商户应该创建成功")
 
 	reqBody := dto.CreateShopRequest{
-		ShopName:     "商户2",
-		ShopCode:     "DUP001",
-		InitUsername: "dupuser2",
+		ShopName:     fmt.Sprintf("shop2_%d", timestamp),
+		ShopCode:     duplicateCode,
+		InitUsername: fmt.Sprintf("dupuser2_%d", timestamp),
 		InitPhone:    testutils.GenerateUniquePhone(),
 		InitPassword: "password123",
 	}
@@ -221,11 +97,7 @@ func TestShopManagement_CreateShop_DuplicateCode(t *testing.T) {
 	body, err := json.Marshal(reqBody)
 	require.NoError(t, err)
 
-	req := httptest.NewRequest("POST", "/api/admin/shops", bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("POST", "/api/admin/shops", body)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -240,18 +112,14 @@ func TestShopManagement_CreateShop_DuplicateCode(t *testing.T) {
 
 // TestShopManagement_ListShops 测试查询商户列表
 func TestShopManagement_ListShops(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 创建测试数据
-	testutil.CreateTestShop(t, env.tx, "商户A", "SHOP_A", 1, nil)
-	testutil.CreateTestShop(t, env.tx, "商户B", "SHOP_B", 1, nil)
-	testutil.CreateTestShop(t, env.tx, "商户C", "SHOP_C", 2, nil)
+	env.CreateTestShop("商户A", 1, nil)
+	env.CreateTestShop("商户B", 1, nil)
+	env.CreateTestShop("商户C", 2, nil)
 
-	req := httptest.NewRequest("GET", "/api/admin/shops?page=1&size=10", nil)
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("GET", "/api/admin/shops?page=1&size=10", nil)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -274,11 +142,10 @@ func TestShopManagement_ListShops(t *testing.T) {
 
 // TestShopManagement_UpdateShop 测试更新商户
 func TestShopManagement_UpdateShop(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 创建测试商户
-	shop := testutil.CreateTestShop(t, env.tx, "原始商户", "ORIG001", 1, nil)
+	shop := env.CreateTestShop("原始商户", 1, nil)
 
 	// 更新商户
 	reqBody := dto.UpdateShopRequest{
@@ -289,11 +156,7 @@ func TestShopManagement_UpdateShop(t *testing.T) {
 	body, err := json.Marshal(reqBody)
 	require.NoError(t, err)
 
-	req := httptest.NewRequest("PUT", fmt.Sprintf("/api/admin/shops/%d", shop.ID), bytes.NewReader(body))
-	req.Header.Set("Content-Type", "application/json")
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("PUT", fmt.Sprintf("/api/admin/shops/%d", shop.ID), body)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -313,17 +176,13 @@ func TestShopManagement_UpdateShop(t *testing.T) {
 
 // TestShopManagement_DeleteShop 测试删除商户
 func TestShopManagement_DeleteShop(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 创建测试商户
-	shop := testutil.CreateTestShop(t, env.tx, "待删除商户", "DEL001", 1, nil)
+	shop := env.CreateTestShop("待删除商户", 1, nil)
 
 	// 删除商户
-	req := httptest.NewRequest("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil)
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -338,17 +197,13 @@ func TestShopManagement_DeleteShop(t *testing.T) {
 
 // TestShopManagement_DeleteShop_WithMultipleAccounts 测试删除商户 - 多个关联账号
 func TestShopManagement_DeleteShop_WithMultipleAccounts(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 创建测试商户
-	shop := testutil.CreateTestShop(t, env.tx, "多账号商户", "MULTI001", 1, nil)
+	shop := env.CreateTestShop("多账号商户", 1, nil)
 
 	// 删除商户
-	req := httptest.NewRequest("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil)
-	req.Header.Set("Authorization", "Bearer "+env.adminToken)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.AsSuperAdmin().Request("DELETE", fmt.Sprintf("/api/admin/shops/%d", shop.ID), nil)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -363,13 +218,10 @@ func TestShopManagement_DeleteShop_WithMultipleAccounts(t *testing.T) {
 
 // TestShopManagement_Unauthorized 测试未认证访问
 func TestShopManagement_Unauthorized(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 不提供 token
-	req := httptest.NewRequest("GET", "/api/admin/shops", nil)
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.ClearAuth().Request("GET", "/api/admin/shops", nil)
 	require.NoError(t, err)
 	defer resp.Body.Close()
 
@@ -379,14 +231,12 @@ func TestShopManagement_Unauthorized(t *testing.T) {
 
 // TestShopManagement_InvalidToken 测试无效 token
 func TestShopManagement_InvalidToken(t *testing.T) {
-	env := setupShopManagementTestEnv(t)
-	defer env.teardown()
+	env := integ.NewIntegrationTestEnv(t)
 
 	// 提供无效 token
-	req := httptest.NewRequest("GET", "/api/admin/shops", nil)
-	req.Header.Set("Authorization", "Bearer invalid-token-12345")
-
-	resp, err := env.app.Test(req, -1)
+	resp, err := env.RequestWithHeaders("GET", "/api/admin/shops", nil, map[string]string{
+		"Authorization": "Bearer invalid-token-12345",
+	})
 	require.NoError(t, err)
 	defer resp.Body.Close()