修复(#75): 适配促销数量与永久订阅判定

Co-authored-by: multica-agent <github@multica.ai>
2026-05-27 01:21:25 -07:00
parent b9192db042
commit 0fcd062804
8 changed files with 144 additions and 44 deletions
@@ -13,7 +13,7 @@ type RuleWithPrice struct {
 }

 type Model interface {
-	QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error)
+	QueryEligibleRules(ctx context.Context, subscribeId int64, quantity int64) ([]*RuleWithPrice, error)
 	InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error
 }

@@ -25,18 +25,22 @@ func NewModel(db *gorm.DB, _ *redis.Client) Model {
 	return &defaultPromoModel{db: db}
 }

-func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64) ([]*RuleWithPrice, error) {
+func (m *defaultPromoModel) QueryEligibleRules(ctx context.Context, subscribeId int64, quantity int64) ([]*RuleWithPrice, error) {
 	var list []*RuleWithPrice
-	err := m.db.WithContext(ctx).
+	err := m.eligibleRulesQuery(ctx, subscribeId, quantity).
+		Find(&list).Error
+	return list, err
+}
+
+func (m *defaultPromoModel) eligibleRulesQuery(ctx context.Context, subscribeId int64, quantity int64) *gorm.DB {
+	return m.db.WithContext(ctx).
 		Table("promo_rule AS pr").
 		Select("pr.*, sp.promo_price").
-		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
+		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id AND sp.quantity = ?", quantity).
 		Where("sp.subscribe_id = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, true).
 		Where("pr.deleted_at IS NULL").
 		Order("pr.priority DESC").
-		Order("pr.id ASC").
-		Find(&list).Error
-	return list, err
+		Order("pr.id ASC")
 }

 func (m *defaultPromoModel) InsertUsage(ctx context.Context, data *Usage, tx ...*gorm.DB) error {