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
112 lines
3.0 KiB
Go
112 lines
3.0 KiB
Go
package task
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
|
|
"github.com/bytedance/sonic"
|
|
"github.com/hibiken/asynq"
|
|
"github.com/redis/go-redis/v9"
|
|
"go.uber.org/zap"
|
|
|
|
"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 CommissionStatsUpdatePayload struct {
|
|
AllocationID uint `json:"allocation_id"`
|
|
SalesCount int64 `json:"sales_count"`
|
|
SalesAmount int64 `json:"sales_amount"`
|
|
}
|
|
|
|
type CommissionStatsUpdateHandler struct {
|
|
redis *redis.Client
|
|
statsStore *postgres.ShopSeriesCommissionStatsStore
|
|
allocationStore *postgres.ShopSeriesAllocationStore
|
|
logger *zap.Logger
|
|
}
|
|
|
|
func NewCommissionStatsUpdateHandler(
|
|
redis *redis.Client,
|
|
statsStore *postgres.ShopSeriesCommissionStatsStore,
|
|
allocationStore *postgres.ShopSeriesAllocationStore,
|
|
logger *zap.Logger,
|
|
) *CommissionStatsUpdateHandler {
|
|
return &CommissionStatsUpdateHandler{
|
|
redis: redis,
|
|
statsStore: statsStore,
|
|
allocationStore: allocationStore,
|
|
logger: logger,
|
|
}
|
|
}
|
|
|
|
func (h *CommissionStatsUpdateHandler) HandleCommissionStatsUpdate(ctx context.Context, task *asynq.Task) error {
|
|
ctx = pkggorm.SkipDataPermission(ctx)
|
|
|
|
var payload CommissionStatsUpdatePayload
|
|
if err := sonic.Unmarshal(task.Payload(), &payload); err != nil {
|
|
h.logger.Error("解析统计更新任务载荷失败",
|
|
zap.Error(err),
|
|
zap.String("task_id", task.ResultWriter().TaskID()),
|
|
)
|
|
return asynq.SkipRetry
|
|
}
|
|
|
|
allocation, err := h.allocationStore.GetByID(ctx, payload.AllocationID)
|
|
if err != nil {
|
|
h.logger.Error("获取分配记录失败",
|
|
zap.Uint("allocation_id", payload.AllocationID),
|
|
zap.Error(err),
|
|
)
|
|
return asynq.SkipRetry
|
|
}
|
|
|
|
if !allocation.EnableTierCommission {
|
|
h.logger.Info("分配未启用梯度返佣，跳过统计更新",
|
|
zap.Uint("allocation_id", payload.AllocationID),
|
|
)
|
|
return nil
|
|
}
|
|
|
|
now := time.Now()
|
|
period := getCurrentPeriod(now)
|
|
redisKey := constants.RedisCommissionStatsKey(payload.AllocationID, period)
|
|
|
|
pipe := h.redis.Pipeline()
|
|
pipe.HIncrBy(ctx, redisKey, "total_count", payload.SalesCount)
|
|
pipe.HIncrBy(ctx, redisKey, "total_amount", payload.SalesAmount)
|
|
|
|
periodEnd := getPeriodEnd(now)
|
|
expireAt := periodEnd.AddDate(0, 0, 7)
|
|
pipe.ExpireAt(ctx, redisKey, expireAt)
|
|
|
|
if _, err := pipe.Exec(ctx); err != nil {
|
|
h.logger.Error("更新 Redis 统计失败",
|
|
zap.Uint("allocation_id", payload.AllocationID),
|
|
zap.String("period", period),
|
|
zap.Error(err),
|
|
)
|
|
return err
|
|
}
|
|
|
|
h.logger.Info("统计更新成功",
|
|
zap.Uint("allocation_id", payload.AllocationID),
|
|
zap.String("period", period),
|
|
zap.Int64("sales_count", payload.SalesCount),
|
|
zap.Int64("sales_amount", payload.SalesAmount),
|
|
)
|
|
|
|
return nil
|
|
}
|
|
|
|
func getCurrentPeriod(t time.Time) string {
|
|
return t.Format("2006-01")
|
|
}
|
|
|
|
func getPeriodEnd(t time.Time) time.Time {
|
|
year, month, _ := t.Date()
|
|
nextMonth := time.Date(year, month+1, 1, 0, 0, 0, 0, t.Location())
|
|
return nextMonth.Add(-time.Second)
|
|
}
|