huang
b18ecfeb55
All checks were successful
构建并部署到测试环境（无 SSH） / build-and-deploy (push) Successful in 6m29s
主要变更: - 新增 tb_shop_series_allocation 表，存储系列级别的一次性佣金配置 - ShopPackageAllocation 移除 one_time_commission_amount 字段 - PackageSeries 新增 enable_one_time_commission 字段控制是否启用一次性佣金 - 新增 /api/admin/shop-series-allocations CRUD 接口 - 佣金计算逻辑改为从 ShopSeriesAllocation 获取一次性佣金金额 - 删除废弃的 ShopSeriesOneTimeCommissionTier 模型 - OpenAPI Tag '系列分配' 和 '单套餐分配' 合并为 '套餐分配' 迁移脚本: - 000042: 重构佣金套餐模型 - 000043: 简化佣金分配 - 000044: 一次性佣金分配重构 - 000045: PackageSeries 添加 enable_one_time_commission 字段 测试: - 新增验收测试 (shop_series_allocation, commission_calculation) - 新增流程测试 (one_time_commission_chain) - 删除过时的单元测试（已被验收测试覆盖）
96 lines
2.6 KiB
Go
96 lines
2.6 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.ShopPackageAllocationStore
|
|
logger *zap.Logger
|
|
}
|
|
|
|
func NewCommissionStatsUpdateHandler(
|
|
redis *redis.Client,
|
|
statsStore *postgres.ShopSeriesCommissionStatsStore,
|
|
allocationStore *postgres.ShopPackageAllocationStore,
|
|
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
|
|
}
|
|
|
|
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)
|
|
}
|