From 93da240f6c5094febfd3881c4422c5589ba96ef9 Mon Sep 17 00:00:00 2001
From: zchengo <1933757688@qq.com>
Date: Fri, 27 Jan 2023 14:42:10 +0800
Subject: [PATCH] fix: subscribe duration and expired error

---
 server/service/subscribe.go | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/service/subscribe.go b/server/service/subscribe.go
index 3f994ac..e59cf51 100644
--- a/server/service/subscribe.go
+++ b/server/service/subscribe.go
@@ -63,20 +63,25 @@ func (s *SubscribeService) PayBack(outTradeNo string) int {
 	}
 
 	// 创建订阅信息
-	expired := order.Duration * 24 * 60 * 60
+	duration := order.Duration * 24 * 60 * 60
 	if !s.subscribeDao.IsExists(order.Uid) {
 		subscribe := models.SubscribeCreateParam{
 			Uid:     order.Uid,
 			Version: 2,
-			Expired: expired,
+			Expired: time.Now().Unix() + duration,
 		}
 		if err := s.subscribeDao.Create(&subscribe); err != nil {
 			return response.ErrCodeFailed
 		}
 	} else {
+		si, err := s.subscribeDao.GetInfo(order.Uid)
+		if err != nil {
+			return response.ErrCodeFailed
+		}
 		subscribe := models.SubscribeUpdateParam{
 			Uid:     order.Uid,
-			Expired: expired,
+			Version: 2,
+			Expired: si.Expired + duration,
 		}
 		if err := s.subscribeDao.Update(&subscribe); err != nil {
 			return response.ErrCodeFailed