From 7e2bc2a59847679f8ea4a8fb50130e1f2f9a9503 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Mon, 29 Apr 2024 13:48:00 +0800
Subject: [PATCH] ~

---
 .../main/java/com/ruoyi/app/controller/PayController.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
index 69fef68..2191c14 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java
@@ -324,8 +324,12 @@ public class PayController extends BaseController
         if (null == startDate) {
             startDate = new Date();
         }
-        Date endDate = appOrder.getLevel() == 1 ? DateUtils.dateAddTime(startDate,3,7)
-                : (appOrder.getLevel() == 2 ? DateUtils.dateAddTime(startDate,4,31) : DateUtils.dateAddTime(startDate,5,365));
+        Date endDate = appUser.getOrderEndTime();
+        if (endDate == null) {
+            endDate = startDate;
+        }
+        endDate = appOrder.getLevel() == 1 ? DateUtils.dateAddTime(endDate,3,7)
+                : (appOrder.getLevel() == 2 ? DateUtils.dateAddTime(endDate,4,31) : DateUtils.dateAddTime(endDate,5,365));
         userEntity.setOrderStartTime(startDate);
         userEntity.setOrderEndTime(endDate);
         appUserMapper.updateAppUser(userEntity);