From 75e13ecd55cce7d58a147aa296a848d1620edcd9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 02 十一月 2023 08:57:52 +0800
Subject: [PATCH] 支付会员送券功能补充 运营商权限bug修改

---
 cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java       |    4 ++--
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
index 7619e28..00e42ef 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/VipPaymentServiceImpl.java
@@ -117,7 +117,7 @@
                                         vipEndTime = new Date();
                                     }
                                     Calendar calendar = Calendar.getInstance();
-                                    calendar.setTime(new Date());
+                                    calendar.setTime(vipEndTime);
                                     calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
                                     appUser.setIsVip(1);
                                     appUser.setVipEndTime(calendar.getTime());
@@ -209,7 +209,7 @@
                                         vipEndTime = new Date();
                                     }
                                     Calendar calendar = Calendar.getInstance();
-                                    calendar.setTime(new Date());
+                                    calendar.setTime(vipEndTime);
                                     calendar.set(Calendar.YEAR, calendar.get(Calendar.YEAR) + 1);
                                     appUser.setVipEndTime(calendar.getTime());
                                     appUserService.updateById(appUser);
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 3692b8f..4d66956 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -104,8 +104,6 @@
             return userIds;
         }
 
-
-        return null;
     }
     /**
      * 获取赛事报名记录

--
Gitblit v1.7.1