修复(#86): 排除永久订阅回归促销误判

Co-authored-by: multica-agent <github@multica.ai>

apis/types.api

@@ -229,7 +229,6 @@ type (
 		Quantity int64   `json:"quantity"`
 		Discount float64 `json:"discount"`
 		MapApple string  `json:"map_apple"`
-		Promo    *SubscribePromo `json:"promo"`
 	}
 	SubscribePromo {
 		RuleName   string `json:"rule_name"`
@@ -251,6 +250,7 @@ type (
 		UnitPrice         int64               `json:"unit_price"`
 		UnitTime          string              `json:"unit_time"`
 		Discount          []SubscribeDiscount `json:"discount"`
+		Promo             *SubscribePromo     `json:"promo"`
 		NodeCount         int64               `json:"node_count"`
 		Replacement       int64               `json:"replacement"`
 		Inventory         int64               `json:"inventory"`

internal/logic/common/promoEligibility.go

@@ -11,6 +11,7 @@ import (
 	"github.com/perfect-panel/server/pkg/xerr"
 	"github.com/pkg/errors"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 type PromoResult struct {
@@ -148,6 +149,12 @@ func evaluateInactiveUserPromo(
 	err := db.WithContext(ctx).
 		Model(&user.Subscribe{}).
 		Where("user_id = ?", userID).
+		Order(clause.OrderBy{
+			Expression: clause.Expr{
+				SQL:  "CASE WHEN expire_time = ? THEN 0 ELSE 1 END",
+				Vars: []interface{}{permanentSubscribeExpireTime()},
+			},
+		}).
 		Order("expire_time DESC").
 		Limit(1).
 		Take(&lastSub).Error
@@ -158,8 +165,19 @@ func evaluateInactiveUserPromo(
 		return false, time.Time{}, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "query promo inactive user subscription failed")
 	}
 
-	threshold := now.AddDate(0, -params.InactiveMonths, 0)
-	return lastSub.ExpireTime.Before(threshold) || lastSub.ExpireTime.Equal(threshold), ruleExpiresAt, nil
+	return isInactivePromoEligible(lastSub.ExpireTime, now, params.InactiveMonths), ruleExpiresAt, nil
+}
+
+func isInactivePromoEligible(expireTime time.Time, now time.Time, inactiveMonths int) bool {
+	if expireTime.Equal(permanentSubscribeExpireTime()) {
+		return false
+	}
+	threshold := now.AddDate(0, -inactiveMonths, 0)
+	return expireTime.Before(threshold) || expireTime.Equal(threshold)
+}
+
+func permanentSubscribeExpireTime() time.Time {
+	return time.UnixMilli(0)
 }
 
 func promoRuleExpiresAt(rule *promo.RuleWithPrice) time.Time {

internal/logic/common/promoEligibility_test.go

@@ -0,0 +1,51 @@
+package common
+
+import (
+	"testing"
+	"time"
+)
+
+func TestIsInactivePromoEligible(t *testing.T) {
+	now := time.Date(2026, time.May, 27, 12, 0, 0, 0, time.UTC)
+
+	tests := []struct {
+		name     string
+		expireAt time.Time
+		want     bool
+	}{
+		{
+			name:     "expired before inactive threshold is eligible",
+			expireAt: now.AddDate(0, -4, 0),
+			want:     true,
+		},
+		{
+			name:     "expired exactly at inactive threshold is eligible",
+			expireAt: now.AddDate(0, -3, 0),
+			want:     true,
+		},
+		{
+			name:     "recently expired subscription is not eligible",
+			expireAt: now.AddDate(0, -2, 0),
+			want:     false,
+		},
+		{
+			name:     "active future subscription is not eligible",
+			expireAt: now.Add(time.Hour),
+			want:     false,
+		},
+		{
+			name:     "permanent subscription marker is not eligible",
+			expireAt: time.UnixMilli(0),
+			want:     false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := isInactivePromoEligible(tt.expireAt, now, 3)
+			if got != tt.want {
+				t.Fatalf("isInactivePromoEligible() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

internal/logic/public/subscribe/promo.go

@@ -25,7 +25,6 @@ const (
 
 type subscribePromoCandidate struct {
 	SubscribeId int64      `gorm:"column:subscribe_id"`
-	Quantity    int64      `gorm:"column:quantity"`
 	RuleName    string     `gorm:"column:rule_name"`
 	RuleType    string     `gorm:"column:rule_type"`
 	PromoPrice  int64      `gorm:"column:promo_price"`
@@ -39,8 +38,8 @@ type promoRuleParams struct {
 	InactiveMonths int   `json:"inactive_months"`
 }
 
-func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64) (map[int64]map[int64]*types.SubscribePromo, error) {
-	result := make(map[int64]map[int64]*types.SubscribePromo)
+func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subscribeIDs []int64) (map[int64]*types.SubscribePromo, error) {
+	result := make(map[int64]*types.SubscribePromo)
 	if len(subscribeIDs) == 0 || svcCtx == nil || svcCtx.DB == nil {
 		return result, nil
 	}
@@ -57,7 +56,7 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
 	evaluator := promoEligibilityEvaluator{ctx: ctx, db: svcCtx.DB, userInfo: userInfo}
 	now := time.Now()
 	for _, candidate := range candidates {
-		if _, exists := result[candidate.SubscribeId][candidate.Quantity]; exists {
+		if _, exists := result[candidate.SubscribeId]; exists {
 			continue
 		}
 		if !candidate.isActive(now) {
@@ -70,10 +69,7 @@ func loadSubscribePromoMap(ctx context.Context, svcCtx *svc.ServiceContext, subs
 		if !ok {
 			continue
 		}
-		if _, exists := result[candidate.SubscribeId]; !exists {
-			result[candidate.SubscribeId] = make(map[int64]*types.SubscribePromo)
-		}
-		result[candidate.SubscribeId][candidate.Quantity] = &types.SubscribePromo{
+		result[candidate.SubscribeId] = &types.SubscribePromo{
 			RuleName:   candidate.RuleName,
 			RuleType:   candidate.RuleType,
 			PromoPrice: candidate.PromoPrice,
@@ -88,7 +84,7 @@ func querySubscribePromoCandidates(ctx context.Context, svcCtx *svc.ServiceConte
 	var candidates []subscribePromoCandidate
 	query := svcCtx.DB.WithContext(ctx).
 		Table("subscribe_promo AS sp").
-		Select("sp.subscribe_id, sp.quantity, sp.promo_price, pr.name AS rule_name, pr.type AS rule_type, pr.params, pr.start_time, pr.end_time").
+		Select("sp.subscribe_id, sp.promo_price, pr.name AS rule_name, pr.type AS rule_type, pr.params, pr.start_time, pr.end_time").
 		Joins("JOIN promo_rule AS pr ON pr.id = sp.promo_rule_id AND pr.deleted_at IS NULL").
 		Where("sp.subscribe_id IN ? AND sp.promo_price > 0 AND pr.enabled = ?", subscribeIDs, true)
 	if !loggedIn {
@@ -96,7 +92,6 @@ func querySubscribePromoCandidates(ctx context.Context, svcCtx *svc.ServiceConte
 	}
 	err := query.
 		Order("sp.subscribe_id ASC").
-		Order("sp.quantity ASC").
 		Order("pr.priority DESC").
 		Order("pr.id ASC").
 		Scan(&candidates).Error

internal/logic/public/subscribe/querySubscribeListLogic.go

@@ -56,19 +56,11 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 			var discount []types.SubscribeDiscount
 			_ = json.Unmarshal([]byte(item.Discount), &discount)
 			sub.Discount = discount
+			list[i] = sub
 		}
 		list[i] = sub
 	}
 
-	promos, err := loadSubscribePromoMap(l.ctx, l.svcCtx, subscribeIDs)
-	if err != nil {
-		l.Errorw("[QuerySubscribeListLogic] Query Promo Error", logger.Field("error", err.Error()))
-		return nil, err
-	}
-	for i := range list {
-		applySubscribeDiscountPromos(&list[i], promos[list[i].Id])
-	}
-
 	// 老版本客户端（无 X-App-Id）去掉每个套餐 discount 的最后一个
 	hasAppId, _ := l.ctx.Value(constant.CtxKeyHasAppId).(bool)
 	if !hasAppId {
@@ -79,13 +71,16 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList(req *types.QuerySubscribeLi
 		}
 	}
 
+	promos, err := loadSubscribePromoMap(l.ctx, l.svcCtx, subscribeIDs)
+	if err != nil {
+		l.Errorw("[QuerySubscribeListLogic] Query Promo Error", logger.Field("error", err.Error()))
+		return nil, err
+	}
+	for i := range list {
+		list[i].Promo = promos[list[i].Id]
+	}
+
 	resp.List = list
 	resp.Total = int64(len(list))
 	return
 }
-
-func applySubscribeDiscountPromos(subscribe *types.Subscribe, promoByQuantity map[int64]*types.SubscribePromo) {
-	for i := range subscribe.Discount {
-		subscribe.Discount[i].Promo = promoByQuantity[subscribe.Discount[i].Quantity]
-	}
-}

internal/types/types.go

@@ -2789,6 +2789,7 @@ type Subscribe struct {
 	UnitPrice         int64               `json:"unit_price"`
 	UnitTime          string              `json:"unit_time"`
 	Discount          []SubscribeDiscount `json:"discount"`
+	Promo             *SubscribePromo     `json:"promo"`
 	NodeCount         int64               `json:"node_count"`
 	Replacement       int64               `json:"replacement"`
 	Inventory         int64               `json:"inventory"`
@@ -2849,11 +2850,10 @@ type SubscribeConfig struct {
 }
 
 type SubscribeDiscount struct {
-	Quantity    int64           `json:"quantity"`
-	Discount    float64         `json:"discount"`
-	NewUserOnly bool            `json:"new_user_only"`
-	MapApple    string          `json:"map_apple"`
-	Promo       *SubscribePromo `json:"promo"`
+	Quantity    int64   `json:"quantity"`
+	Discount    float64 `json:"discount"`
+	NewUserOnly bool    `json:"new_user_only"`
+	MapApple    string  `json:"map_apple"`
 }
 
 type SubscribeGroup struct {