重构: 店铺套餐分配系统从加价模式改为返佣模式
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

@@ -0,0 +1,155 @@
package task
import (
"context"
"strconv"
"strings"
"time"
"github.com/hibiken/asynq"
"github.com/redis/go-redis/v9"
"go.uber.org/zap"
"gorm.io/gorm"
"github.com/break/junhong_cmp_fiber/internal/model"
"github.com/break/junhong_cmp_fiber/internal/store/postgres"
"github.com/break/junhong_cmp_fiber/pkg/constants"
pkggorm "github.com/break/junhong_cmp_fiber/pkg/gorm"
)
type CommissionStatsSyncHandler struct {
db *gorm.DB
redis *redis.Client
statsStore *postgres.ShopSeriesCommissionStatsStore
logger *zap.Logger
}
func NewCommissionStatsSyncHandler(
db *gorm.DB,
redis *redis.Client,
statsStore *postgres.ShopSeriesCommissionStatsStore,
logger *zap.Logger,
) *CommissionStatsSyncHandler {
return &CommissionStatsSyncHandler{
db: db,
redis: redis,
statsStore: statsStore,
logger: logger,
}
}
func (h *CommissionStatsSyncHandler) HandleCommissionStatsSync(ctx context.Context, task *asynq.Task) error {
ctx = pkggorm.SkipDataPermission(ctx)
lockKey := constants.RedisCommissionStatsLockKey()
locked, err := h.redis.SetNX(ctx, lockKey, "1", 5*time.Minute).Result()
if err != nil {
h.logger.Error("获取同步锁失败", zap.Error(err))
return err
}
if !locked {
h.logger.Info("同步任务已在执行,跳过本次")
return nil
}
defer h.redis.Del(ctx, lockKey)
pattern := "commission:stats:*"
var cursor uint64
syncCount := 0
for {
keys, nextCursor, err := h.redis.Scan(ctx, cursor, pattern, 100).Result()
if err != nil {
h.logger.Error("扫描 Redis keys 失败", zap.Error(err))
return err
}
for _, key := range keys {
if err := h.syncStatsFromRedis(ctx, key); err != nil {
h.logger.Error("同步统计失败",
zap.String("key", key),
zap.Error(err),
)
continue
}
syncCount++
}
cursor = nextCursor
if cursor == 0 {
break
}
}
h.logger.Info("统计同步完成", zap.Int("sync_count", syncCount))
return nil
}
func (h *CommissionStatsSyncHandler) syncStatsFromRedis(ctx context.Context, redisKey string) error {
parts := strings.Split(redisKey, ":")
if len(parts) != 4 {
return nil
}
allocationID, err := strconv.ParseUint(parts[2], 10, 32)
if err != nil {
return err
}
period := parts[3]
data, err := h.redis.HGetAll(ctx, redisKey).Result()
if err != nil {
return err
}
if len(data) == 0 {
return nil
}
totalCount, _ := strconv.ParseInt(data["total_count"], 10, 64)
totalAmount, _ := strconv.ParseInt(data["total_amount"], 10, 64)
periodStart, periodEnd := parsePeriod(period)
return h.db.Transaction(func(tx *gorm.DB) error {
var stats model.ShopSeriesCommissionStats
err := tx.Where("allocation_id = ? AND period_start = ? AND period_end = ?",
allocationID, periodStart, periodEnd).
First(&stats).Error
if err == gorm.ErrRecordNotFound {
stats = model.ShopSeriesCommissionStats{
AllocationID: uint(allocationID),
PeriodType: "monthly",
PeriodStart: periodStart,
PeriodEnd: periodEnd,
TotalSalesCount: totalCount,
TotalSalesAmount: totalAmount,
Status: "active",
LastUpdatedAt: time.Now(),
}
return tx.Create(&stats).Error
}
if err != nil {
return err
}
return tx.Model(&stats).
Where("version = ?", stats.Version).
Updates(map[string]interface{}{
"total_sales_count": totalCount,
"total_sales_amount": totalAmount,
"last_updated_at": time.Now(),
"version": gorm.Expr("version + 1"),
}).Error
})
}
func parsePeriod(period string) (time.Time, time.Time) {
t, _ := time.Parse("2006-01", period)
periodStart := time.Date(t.Year(), t.Month(), 1, 0, 0, 0, 0, time.UTC)
periodEnd := periodStart.AddDate(0, 1, 0).Add(-time.Second)
return periodStart, periodEnd
}