From 6912e281f3f21c578d01812d27495745d269c148 Mon Sep 17 00:00:00 2001
From: Chang lue Tsen <tension@ppanel.dev>
Date: Mon, 5 May 2025 04:30:49 -0400
Subject: [PATCH] fix(subscribe): correct subscription status update logic on
 renewal

---
 queue/logic/order/activateOrderLogic.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/queue/logic/order/activateOrderLogic.go b/queue/logic/order/activateOrderLogic.go
index 8ca9308..5f280f4 100644
--- a/queue/logic/order/activateOrderLogic.go
+++ b/queue/logic/order/activateOrderLogic.go
@@ -366,7 +366,6 @@ func (l *ActivateOrderLogic) Renewal(ctx context.Context, orderInfo *order.Order
 	now := time.Now()
 	if userSub.ExpireTime.Before(now) {
 		userSub.ExpireTime = now
-		userSub.Status = 1
 	}
 
 	// Check whether traffic reset on renewal is enabled
@@ -379,6 +378,7 @@ func (l *ActivateOrderLogic) Renewal(ctx context.Context, orderInfo *order.Order
 	}
 
 	userSub.ExpireTime = tool.AddTime(sub.UnitTime, orderInfo.Quantity, userSub.ExpireTime)
+	userSub.Status = 1
 	// update user subscribe
 	err = l.svc.UserModel.UpdateSubscribe(ctx, userSub)
 	if err != nil {