重构: 店铺套餐分配系统从加价模式改为返佣模式
All checks were successful
构建并部署到测试环境(无 SSH) / build-and-deploy (push) Successful in 5m18s

主要变更:
- 重构分配模型:从加价模式(pricing_mode/pricing_value)改为返佣模式(base_commission + tier_commission)
- 删除独立的 my_package 接口,统一到 /api/admin/packages(通过数据权限自动过滤)
- 新增批量分配和批量调价功能,支持事务和性能优化
- 新增配置版本管理,订单创建时锁定返佣配置
- 新增成本价历史记录,支持审计和纠纷处理
- 新增统计缓存系统(Redis + 异步任务),优化梯度返佣计算性能
- 删除冗余的梯度佣金独立 CRUD 接口(合并到分配配置中)
- 归档 3 个已完成的 OpenSpec changes 并同步 8 个新 capabilities 到 main specs

技术细节:
- 数据库迁移:000026_refactor_shop_package_allocation
- 新增 Store:AllocationConfigStore, PriceHistoryStore, CommissionStatsStore
- 新增 Service:BatchAllocationService, BatchPricingService, CommissionStatsService
- 新增异步任务:统计更新、定时同步、周期归档
- 测试覆盖:批量操作集成测试、梯度佣金 CRUD 清理验证

影响:
- API 变更:删除 4 个梯度 CRUD 接口(POST/GET/PUT/DELETE /:id/tiers)
- API 新增:批量分配、批量调价接口
- 数据模型:重构 shop_series_allocation 表结构
- 性能优化:批量操作使用 CreateInBatches,统计使用 Redis 缓存

相关文档:
- openspec/changes/archive/2026-01-28-refactor-shop-package-allocation/
- openspec/specs/agent-available-packages/
- openspec/specs/allocation-config-versioning/
- 等 8 个新 capability specs
This commit is contained in:
2026-01-28 17:11:55 +08:00
parent 23eb0307bb
commit 1da680a790
97 changed files with 6810 additions and 3622 deletions

View File

@@ -6,6 +6,7 @@ import (
"testing"
"time"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/model/dto"
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
"github.com/break/junhong_cmp_fiber/pkg/constants"
@@ -24,7 +25,7 @@ func TestPackageService_Create(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -97,7 +98,7 @@ func TestPackageService_UpdateStatus(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -167,7 +168,7 @@ func TestPackageService_UpdateShelfStatus(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -254,7 +255,7 @@ func TestPackageService_Get(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -292,7 +293,7 @@ func TestPackageService_Update(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -341,7 +342,7 @@ func TestPackageService_Delete(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -376,7 +377,7 @@ func TestPackageService_List(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
@@ -454,3 +455,135 @@ func TestPackageService_List(t *testing.T) {
}
})
}
func TestPackageService_SeriesNameInResponse(t *testing.T) {
tx := testutils.NewTestTransaction(t)
packageStore := postgres.NewPackageStore(tx)
packageSeriesStore := postgres.NewPackageSeriesStore(tx)
svc := New(packageStore, packageSeriesStore, nil, nil, nil)
ctx := middleware.SetUserContext(context.Background(), &middleware.UserContextInfo{
UserID: 1,
UserType: constants.UserTypePlatform,
})
// 创建套餐系列
series := &model.PackageSeries{
SeriesCode: fmt.Sprintf("SERIES_%d", time.Now().UnixNano()),
SeriesName: "测试套餐系列",
Description: "用于测试系列名称字段",
Status: constants.StatusEnabled,
}
series.Creator = 1
err := packageSeriesStore.Create(ctx, series)
require.NoError(t, err)
t.Run("创建套餐时返回系列名称", func(t *testing.T) {
req := &dto.CreatePackageRequest{
PackageCode: generateUniquePackageCode("PKG_SERIES"),
PackageName: "带系列的套餐",
SeriesID: &series.ID,
PackageType: "formal",
DurationMonths: 1,
Price: 9900,
}
resp, err := svc.Create(ctx, req)
require.NoError(t, err)
assert.NotNil(t, resp.SeriesName)
assert.Equal(t, series.SeriesName, *resp.SeriesName)
})
t.Run("获取套餐时返回系列名称", func(t *testing.T) {
// 先创建一个套餐
req := &dto.CreatePackageRequest{
PackageCode: generateUniquePackageCode("PKG_GET_SERIES"),
PackageName: "获取测试套餐",
SeriesID: &series.ID,
PackageType: "formal",
DurationMonths: 1,
Price: 9900,
}
created, err := svc.Create(ctx, req)
require.NoError(t, err)
// 获取套餐
resp, err := svc.Get(ctx, created.ID)
require.NoError(t, err)
assert.NotNil(t, resp.SeriesName)
assert.Equal(t, series.SeriesName, *resp.SeriesName)
})
t.Run("更新套餐时返回系列名称", func(t *testing.T) {
// 先创建一个套餐
req := &dto.CreatePackageRequest{
PackageCode: generateUniquePackageCode("PKG_UPDATE_SERIES"),
PackageName: "更新测试套餐",
SeriesID: &series.ID,
PackageType: "formal",
DurationMonths: 1,
Price: 9900,
}
created, err := svc.Create(ctx, req)
require.NoError(t, err)
// 更新套餐
newName := "更新后的套餐"
updateReq := &dto.UpdatePackageRequest{
PackageName: &newName,
}
resp, err := svc.Update(ctx, created.ID, updateReq)
require.NoError(t, err)
assert.NotNil(t, resp.SeriesName)
assert.Equal(t, series.SeriesName, *resp.SeriesName)
})
t.Run("列表查询时返回系列名称", func(t *testing.T) {
// 创建多个带系列的套餐
for i := 0; i < 3; i++ {
req := &dto.CreatePackageRequest{
PackageCode: generateUniquePackageCode(fmt.Sprintf("PKG_LIST_SERIES_%d", i)),
PackageName: fmt.Sprintf("列表测试套餐%d", i),
SeriesID: &series.ID,
PackageType: "formal",
DurationMonths: 1,
Price: 9900,
}
_, err := svc.Create(ctx, req)
require.NoError(t, err)
}
// 查询列表
listReq := &dto.PackageListRequest{
Page: 1,
PageSize: 10,
SeriesID: &series.ID,
}
resp, _, err := svc.List(ctx, listReq)
require.NoError(t, err)
assert.Greater(t, len(resp), 0)
// 验证所有套餐都有系列名称
for _, pkg := range resp {
if pkg.SeriesID != nil && *pkg.SeriesID == series.ID {
assert.NotNil(t, pkg.SeriesName)
assert.Equal(t, series.SeriesName, *pkg.SeriesName)
}
}
})
t.Run("没有系列的套餐SeriesName为空", func(t *testing.T) {
req := &dto.CreatePackageRequest{
PackageCode: generateUniquePackageCode("PKG_NO_SERIES"),
PackageName: "无系列套餐",
PackageType: "formal",
DurationMonths: 1,
Price: 9900,
}
resp, err := svc.Create(ctx, req)
require.NoError(t, err)
assert.Nil(t, resp.SeriesID)
assert.Nil(t, resp.SeriesName)
})
}