修复(#19): 续费订单支持限时活动价 (#19)

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

internal/logic/public/order/renewalLogic.go

@@ -3,7 +3,6 @@ package order
 import (
 	"context"
 	"encoding/json"
-	"math"
 	"time"
 
 	"github.com/google/uuid"
@@ -165,13 +164,28 @@ func (l *RenewalLogic) Renewal(req *types.RenewalOrderRequest) (resp *types.Rene
 		)
 		return nil, err
 	}
-	var discount float64 = 1
-	if len(newUserDiscount.Discounts) > 0 {
-		discount = getDiscount(newUserDiscount.Discounts, req.Quantity, newUserDiscount.EligibleForDiscount)
+	priceResult, err := calculateRenewalPrice(
+		l.ctx,
+		l.svcCtx,
+		entitlement.EffectiveUserID,
+		userSubscribe.SubscribeId,
+		sub.UnitPrice,
+		req.Quantity,
+		newUserDiscount.Discounts,
+		newUserDiscount.EligibleForDiscount,
+	)
+	if err != nil {
+		l.Errorw("[Renewal] Promo price calculation error",
+			logger.Field("error", err.Error()),
+			logger.Field("user_id", u.Id),
+			logger.Field("effective_user_id", entitlement.EffectiveUserID),
+			logger.Field("subscribe_id", userSubscribe.SubscribeId),
+		)
+		return nil, err
 	}
-	price := sub.UnitPrice * req.Quantity
-	amount := int64(math.Round(float64(price) * discount))
-	discountAmount := price - amount
+	price := priceResult.OriginalPrice
+	amount := priceResult.PayableBase
+	discountAmount := priceResult.DiscountAmount
 
 	// Validate amount to prevent overflow
 	if amount > MaxOrderAmount {
@@ -269,6 +283,8 @@ func (l *RenewalLogic) Renewal(req *types.RenewalOrderRequest) (resp *types.Rene
 		Amount:             amount,
 		GiftAmount:         deductionAmount,
 		Discount:           discountAmount,
+		PromoRuleId:        priceResult.PromoRuleId,
+		PromoDiscount:      priceResult.PromoDiscount,
 		Coupon:             req.Coupon,
 		CouponDiscount:     coupon,
 		PaymentId:          payment.Id,