diff --git a/internal/logic/public/order/getDiscount.go b/internal/logic/public/order/getDiscount.go index af21ced..ee7dd4e 100644 --- a/internal/logic/public/order/getDiscount.go +++ b/internal/logic/public/order/getDiscount.go @@ -3,32 +3,26 @@ package order import "github.com/perfect-panel/server/internal/types" func getDiscount(discounts []types.SubscribeDiscount, inputMonths int64, isNewUser bool) float64 { - var finalDiscount float64 = 100 - for _, discount := range discounts { if discount.NewUserOnly && !isNewUser { continue } - if inputMonths >= discount.Quantity && discount.Discount < finalDiscount { - finalDiscount = discount.Discount + if inputMonths == discount.Quantity && discount.Discount > 0 && discount.Discount < 100 { + return discount.Discount / float64(100) } } - return finalDiscount / float64(100) + return 1 } // isNewUserOnlyForQuantity checks whether the matched discount tier has new_user_only enabled. func isNewUserOnlyForQuantity(discounts []types.SubscribeDiscount, inputQuantity int64) bool { - var finalDiscount float64 = 100 - var newUserOnly bool - for _, discount := range discounts { - if inputQuantity >= discount.Quantity && discount.Discount < finalDiscount { - finalDiscount = discount.Discount - newUserOnly = discount.NewUserOnly + if inputQuantity == discount.Quantity { + return discount.NewUserOnly } } - return newUserOnly + return false } diff --git a/internal/logic/public/portal/tool.go b/internal/logic/public/portal/tool.go index 2fa92b6..939b599 100644 --- a/internal/logic/public/portal/tool.go +++ b/internal/logic/public/portal/tool.go @@ -7,17 +7,15 @@ import ( ) func getDiscount(discounts []types.SubscribeDiscount, inputMonths int64, isNewUser bool) float64 { - var finalDiscount float64 = 100 - for _, discount := range discounts { if discount.NewUserOnly && !isNewUser { continue } - if inputMonths >= discount.Quantity && discount.Discount < finalDiscount { - finalDiscount = discount.Discount + if inputMonths == discount.Quantity && discount.Discount > 0 && discount.Discount < 100 { + return discount.Discount / float64(100) } } - return finalDiscount / float64(100) + return 1 } func calculateCoupon(amount int64, couponInfo *coupon.Coupon) int64 { diff --git a/queue/logic/order/activateOrderLogic.go b/queue/logic/order/activateOrderLogic.go index f2fdad6..ad4fe05 100644 --- a/queue/logic/order/activateOrderLogic.go +++ b/queue/logic/order/activateOrderLogic.go @@ -1479,15 +1479,11 @@ func (l *ActivateOrderLogic) RedemptionActivate(ctx context.Context, orderInfo * // isNewUserOnlyForQuantity checks whether the matched discount tier has new_user_only enabled. func isNewUserOnlyForQuantity(discounts []internaltypes.SubscribeDiscount, inputQuantity int64) bool { - var finalDiscount float64 = 100 - var newUserOnly bool - for _, d := range discounts { - if inputQuantity >= d.Quantity && d.Discount < finalDiscount { - finalDiscount = d.Discount - newUserOnly = d.NewUserOnly + if inputQuantity == d.Quantity { + return d.NewUserOnly } } - return newUserOnly + return false }