x

internal/logic/public/order/preCreateOrderLogic.go

@@ -2,9 +2,7 @@ package order
 
 import (
 	"context"
-	"encoding/json"
 	"math"
-	"time"
 
 	commonLogic "github.com/perfect-panel/server/internal/logic/common"
 	"github.com/perfect-panel/server/internal/model/order"
@@ -105,47 +103,21 @@ func (l *PreCreateOrderLogic) PreCreateOrder(req *types.PurchaseOrderRequest) (r
 		}
 	}
 
-	// check new user only restriction (tier-level only)
-	// Only block users who registered more than 24h ago; users within 24h who already purchased
-	// are allowed to preview (they just won't receive the new-user discount).
-	var newUserOnly bool
-	if !isSingleModeRenewal && sub.Discount != "" {
-		var dis []types.SubscribeDiscount
-		_ = json.Unmarshal([]byte(sub.Discount), &dis)
-		newUserOnly = isNewUserOnlyForQuantity(dis, req.Quantity)
+	newUserDiscount, err := resolveNewUserDiscountEligibility(l.ctx, l.svcCtx.DB, u.Id, targetSubscribeID, req.Quantity, sub.Discount)
+	if err != nil {
+		l.Errorw("[PreCreateOrder] Database query error resolving new user eligibility",
+			logger.Field("error", err.Error()),
+			logger.Field("user_id", u.Id),
+		)
+		return nil, err
 	}
-	if newUserOnly {
-		if time.Since(u.CreatedAt) > 24*time.Hour {
-			return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
-		}
+	if !isSingleModeRenewal && newUserDiscount.NewUserOnly && !newUserDiscount.WithinWindow {
+		return nil, errors.Wrapf(xerr.NewErrCode(xerr.SubscribeNewUserOnly), "not a new user")
 	}
 
 	var discount float64 = 1
-	isNewUserForDiscount := time.Since(u.CreatedAt) <= 24*time.Hour
-	if isNewUserForDiscount && sub.Discount != "" {
-		// If the matched tier is new_user_only, check whether the user has already purchased this plan.
-		// If so, they are not eligible for the new-user discount (but the order is still allowed).
-		var dis []types.SubscribeDiscount
-		_ = json.Unmarshal([]byte(sub.Discount), &dis)
-		if isNewUserOnlyForQuantity(dis, req.Quantity) {
-			var historyCount int64
-			if e := l.svcCtx.DB.Model(&order.Order{}).
-				Where("user_id = ? AND subscribe_id = ? AND type = 1 AND status IN ?",
-					u.Id, targetSubscribeID, []int64{2, 5}).
-				Count(&historyCount).Error; e != nil {
-				l.Errorw("[PreCreateOrder] Database query error checking new user discount eligibility",
-					logger.Field("error", e.Error()), logger.Field("user_id", u.Id))
-				return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "check new user discount history error: %v", e.Error())
-			}
-			if historyCount >= 1 {
-				isNewUserForDiscount = false
-			}
-		}
-	}
-	if sub.Discount != "" {
-		var dis []types.SubscribeDiscount
-		_ = json.Unmarshal([]byte(sub.Discount), &dis)
-		discount = getDiscount(dis, req.Quantity, isNewUserForDiscount)
+	if len(newUserDiscount.Discounts) > 0 {
+		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
 	}
 	price := sub.UnitPrice * req.Quantity