From 3734e491352712c7c744a999bbb7341622478c84 Mon Sep 17 00:00:00 2001
From: howell <2827207845@qq.com>
Date: Wed, 16 Mar 2022 15:44:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=9B=E5=BB=BAvip=E5=8E=86=E5=8F=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/api/mobile/pay/public/pay_success.go | 4 +++-
 internal/v2/controller/app/vip/vip.go         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/internal/api/mobile/pay/public/pay_success.go b/internal/api/mobile/pay/public/pay_success.go
index 2ccef35..8f5f678 100755
--- a/internal/api/mobile/pay/public/pay_success.go
+++ b/internal/api/mobile/pay/public/pay_success.go
@@ -104,8 +104,10 @@ func PaySuccessCallback(tx *gorm.DB, orderInfo order.Information, completeTime f
 			now1 := time.Now()
 			now := time.Date(now1.Year(), now1.Month(), now1.Day(), 0, 0, 0, 00, time.Local)
 			end := now
+			level := u1.Level
 			if u1.VipUpgradeEnd.Valid && time.Now().Before(u1.VipUpgradeEnd.Time) {
 				// 续约
+				level = u1.OldLevel
 				now = u1.VipUpgradeStart.Time
 				end = u1.VipUpgradeEnd.Time
 			} else {
@@ -145,7 +147,7 @@ func PaySuccessCallback(tx *gorm.DB, orderInfo order.Information, completeTime f
 				Start:    &now,
 				End:      &end,
 				Amount:   orderInfo.ActualTotalAmount,
-				Level:    u1.Level,
+				Level:    level,
 				NickName: u1.Nickname,
 				Mobile:   u1.Mobile,
 				Kind:     kind,
diff --git a/internal/v2/controller/app/vip/vip.go b/internal/v2/controller/app/vip/vip.go
index a9a12dc..ad578e0 100644
--- a/internal/v2/controller/app/vip/vip.go
+++ b/internal/v2/controller/app/vip/vip.go
@@ -83,8 +83,10 @@ func (o Proxy) VipActive(c *gin.Context) {
 	now1 := time.Now()
 	now := time.Date(now1.Year(), now1.Month(), now1.Day(), 0, 0, 0, 00, time.Local)
 	end := now
+	level := u1.Level
 	if u1.VipUpgradeEnd.Valid && time.Now().Before(u1.VipUpgradeEnd.Time) {
 		// 续约
+		level := u1.OldLevel
 		now = u1.VipUpgradeStart.Time
 		end = u1.VipUpgradeEnd.Time
 	} else {
@@ -111,7 +113,7 @@ func (o Proxy) VipActive(c *gin.Context) {
 			Start:    &now,
 			End:      &end,
 			Amount:   decimal.Zero,
-			Level:    u1.Level,
+			Level:    level,
 			NickName: u1.Nickname,
 			Mobile:   u1.Mobile,
 			Kind:     kind,