huang
1da680a790
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
255 lines
8.1 KiB
Go
255 lines
8.1 KiB
Go
package integration
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/break/junhong_cmp_fiber/internal/model"
|
|
"github.com/break/junhong_cmp_fiber/pkg/constants"
|
|
"github.com/break/junhong_cmp_fiber/pkg/response"
|
|
"github.com/break/junhong_cmp_fiber/tests/testutils/integ"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestMyPackageAPI_ListMyPackages(t *testing.T) {
|
|
env := integ.NewIntegrationTestEnv(t)
|
|
|
|
parentShop := env.CreateTestShop("一级店铺", 1, nil)
|
|
childShop := env.CreateTestShop("二级店铺", 2, &parentShop.ID)
|
|
agentAccount := env.CreateTestAccount("agent_my_pkg", "password123", constants.UserTypeAgent, &childShop.ID, nil)
|
|
|
|
series := createTestPackageSeriesForMyPkg(t, env, "测试系列")
|
|
pkg := createTestPackageForMyPkg(t, env, series.ID, "测试套餐")
|
|
|
|
createTestAllocationForMyPkg(t, env, parentShop.ID, series.ID, 0)
|
|
createTestAllocationForMyPkg(t, env, childShop.ID, series.ID, parentShop.ID)
|
|
|
|
t.Run("代理查看可售套餐列表", func(t *testing.T) {
|
|
resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/my-packages?page=1&page_size=20", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
assert.Equal(t, 200, resp.StatusCode)
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message)
|
|
|
|
t.Logf("ListMyPackages response: %+v", result.Data)
|
|
})
|
|
|
|
t.Run("按系列ID筛选", func(t *testing.T) {
|
|
url := fmt.Sprintf("/api/admin/my-packages?series_id=%d", series.ID)
|
|
resp, err := env.AsUser(agentAccount).Request("GET", url, nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code)
|
|
})
|
|
|
|
t.Run("按套餐类型筛选", func(t *testing.T) {
|
|
resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/my-packages?package_type=formal", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code)
|
|
})
|
|
|
|
_ = pkg
|
|
}
|
|
|
|
func TestMyPackageAPI_GetMyPackage(t *testing.T) {
|
|
env := integ.NewIntegrationTestEnv(t)
|
|
|
|
parentShop := env.CreateTestShop("一级店铺", 1, nil)
|
|
childShop := env.CreateTestShop("二级店铺", 2, &parentShop.ID)
|
|
agentAccount := env.CreateTestAccount("agent_get_pkg", "password123", constants.UserTypeAgent, &childShop.ID, nil)
|
|
|
|
series := createTestPackageSeriesForMyPkg(t, env, "测试系列")
|
|
pkg := createTestPackageForMyPkg(t, env, series.ID, "测试套餐")
|
|
|
|
createTestAllocationForMyPkg(t, env, parentShop.ID, series.ID, 0)
|
|
createTestAllocationForMyPkg(t, env, childShop.ID, series.ID, parentShop.ID)
|
|
|
|
t.Run("获取可售套餐详情", func(t *testing.T) {
|
|
url := fmt.Sprintf("/api/admin/my-packages/%d", pkg.ID)
|
|
resp, err := env.AsUser(agentAccount).Request("GET", url, nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
assert.Equal(t, 200, resp.StatusCode)
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message)
|
|
|
|
if result.Data != nil {
|
|
dataMap := result.Data.(map[string]interface{})
|
|
assert.Equal(t, float64(pkg.ID), dataMap["id"])
|
|
t.Logf("套餐详情: %+v", dataMap)
|
|
}
|
|
})
|
|
|
|
t.Run("获取不存在的套餐", func(t *testing.T) {
|
|
resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/my-packages/999999", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.NotEqual(t, 0, result.Code, "应返回错误码")
|
|
})
|
|
}
|
|
|
|
func TestMyPackageAPI_ListMySeriesAllocations(t *testing.T) {
|
|
env := integ.NewIntegrationTestEnv(t)
|
|
|
|
parentShop := env.CreateTestShop("一级店铺", 1, nil)
|
|
childShop := env.CreateTestShop("二级店铺", 2, &parentShop.ID)
|
|
agentAccount := env.CreateTestAccount("agent_series_alloc", "password123", constants.UserTypeAgent, &childShop.ID, nil)
|
|
|
|
series1 := createTestPackageSeriesForMyPkg(t, env, "系列1")
|
|
series2 := createTestPackageSeriesForMyPkg(t, env, "系列2")
|
|
|
|
createTestAllocationForMyPkg(t, env, parentShop.ID, series1.ID, 0)
|
|
createTestAllocationForMyPkg(t, env, childShop.ID, series1.ID, parentShop.ID)
|
|
createTestAllocationForMyPkg(t, env, parentShop.ID, series2.ID, 0)
|
|
createTestAllocationForMyPkg(t, env, childShop.ID, series2.ID, parentShop.ID)
|
|
|
|
t.Run("获取被分配的系列列表", func(t *testing.T) {
|
|
resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/my-series-allocations?page=1&page_size=20", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
assert.Equal(t, 200, resp.StatusCode)
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code, "应返回成功: %s", result.Message)
|
|
|
|
t.Logf("ListMySeriesAllocations response: %+v", result.Data)
|
|
})
|
|
|
|
t.Run("分页参数生效", func(t *testing.T) {
|
|
resp, err := env.AsUser(agentAccount).Request("GET", "/api/admin/my-series-allocations?page=1&page_size=1", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.Equal(t, 0, result.Code)
|
|
})
|
|
}
|
|
|
|
func TestMyPackageAPI_Auth(t *testing.T) {
|
|
env := integ.NewIntegrationTestEnv(t)
|
|
|
|
t.Run("未认证请求应返回错误", func(t *testing.T) {
|
|
resp, err := env.ClearAuth().Request("GET", "/api/admin/my-packages", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码")
|
|
})
|
|
|
|
t.Run("未认证访问系列分配列表", func(t *testing.T) {
|
|
resp, err := env.ClearAuth().Request("GET", "/api/admin/my-series-allocations", nil)
|
|
require.NoError(t, err)
|
|
defer resp.Body.Close()
|
|
|
|
var result response.Response
|
|
err = json.NewDecoder(resp.Body).Decode(&result)
|
|
require.NoError(t, err)
|
|
assert.NotEqual(t, 0, result.Code, "未认证请求应返回错误码")
|
|
})
|
|
}
|
|
|
|
func createTestPackageSeriesForMyPkg(t *testing.T, env *integ.IntegrationTestEnv, name string) *model.PackageSeries {
|
|
t.Helper()
|
|
|
|
timestamp := time.Now().UnixNano()
|
|
series := &model.PackageSeries{
|
|
SeriesCode: fmt.Sprintf("SERIES_MY_%d", timestamp),
|
|
SeriesName: name,
|
|
Status: constants.StatusEnabled,
|
|
BaseModel: model.BaseModel{
|
|
Creator: 1,
|
|
Updater: 1,
|
|
},
|
|
}
|
|
|
|
err := env.TX.Create(series).Error
|
|
require.NoError(t, err, "创建测试套餐系列失败")
|
|
|
|
return series
|
|
}
|
|
|
|
func createTestPackageForMyPkg(t *testing.T, env *integ.IntegrationTestEnv, seriesID uint, name string) *model.Package {
|
|
t.Helper()
|
|
|
|
timestamp := time.Now().UnixNano()
|
|
pkg := &model.Package{
|
|
PackageCode: fmt.Sprintf("PKG_%d", timestamp),
|
|
PackageName: name,
|
|
SeriesID: seriesID,
|
|
PackageType: "formal",
|
|
DurationMonths: 1,
|
|
DataType: "real",
|
|
RealDataMB: 1024,
|
|
DataAmountMB: 1024,
|
|
Price: 9900,
|
|
SuggestedRetailPrice: 12800,
|
|
Status: constants.StatusEnabled,
|
|
ShelfStatus: 1,
|
|
BaseModel: model.BaseModel{
|
|
Creator: 1,
|
|
Updater: 1,
|
|
},
|
|
}
|
|
|
|
err := env.TX.Create(pkg).Error
|
|
require.NoError(t, err, "创建测试套餐失败")
|
|
|
|
return pkg
|
|
}
|
|
|
|
func createTestAllocationForMyPkg(t *testing.T, env *integ.IntegrationTestEnv, shopID, seriesID, allocatorShopID uint) *model.ShopSeriesAllocation {
|
|
t.Helper()
|
|
|
|
allocation := &model.ShopSeriesAllocation{
|
|
ShopID: shopID,
|
|
SeriesID: seriesID,
|
|
AllocatorShopID: allocatorShopID,
|
|
BaseCommissionMode: "fixed",
|
|
BaseCommissionValue: 500,
|
|
EnableTierCommission: false,
|
|
Status: constants.StatusEnabled,
|
|
BaseModel: model.BaseModel{
|
|
Creator: 1,
|
|
Updater: 1,
|
|
},
|
|
}
|
|
|
|
err := env.TX.Create(allocation).Error
|
|
require.NoError(t, err, "创建测试分配失败")
|
|
|
|
return allocation
|
|
}
|