修复(#85): 按数量匹配订阅促销价

Co-authored-by: multica-agent <github@multica.ai>
2026-05-27 00:36:24 -07:00
parent 48e507783e
commit ae64cc635d
15 changed files with 209 additions and 41 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,13 +25,13 @@ 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).
 		Table("promo_rule AS pr").
 		Select("pr.*, sp.promo_price").
 		Joins("JOIN subscribe_promo AS sp ON sp.promo_rule_id = pr.id").
-		Where("sp.subscribe_id = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, true).
+		Where("sp.subscribe_id = ? AND sp.quantity = ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeId, quantity, true).
 		Where("pr.deleted_at IS NULL").
 		Order("pr.priority DESC").
 		Order("pr.id ASC").