From a3c57e7bceb0e434727a778846cd7cced2afc201 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E8=89=AF=28004796=29?= <zhanglian.zl@fcbox.com>
Date: Wed, 24 Apr 2024 20:02:20 +0800
Subject: [PATCH] init

---
 ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java           | 2 ++
 .../java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java   | 2 ++
 .../src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
index 316b1c9..7355ae4 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/User.java
@@ -47,6 +47,8 @@ public class User implements Serializable {
      */
     @Schema(description = "开通的VIP类型")
     private Integer vipType;
+    @Schema(description = "vip到期时间")
+    private LocalDateTime vipTimeout;
     /**
      * 密码
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
index 43bb339..1fa9252 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
@@ -80,6 +80,8 @@ public class CurrentUserInfoVo {
      */
     @Schema(description = "vip等级",hidden = true)
     private Integer vipType;
+    @Schema(description = "vip到期时间")
+    private LocalDateTime vipTimeout;
     /**
      * 收益的余额
      */
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
index 5b4c07a..30b4ccf 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
@@ -118,7 +118,8 @@ public class CurrentUserManager {
         vo.setUserPicturesList(BeanConvertUtil.convertListTo(userPictures, UserPicturesDTO::new));
         if(user.getOpenVip() != null){
             vo.setOpenVip(user.getOpenVip());
-//            vo.setVipType();
+            vo.setVipType(user.getVipType());
+            vo.setVipTimeout(user.getVipTimeout());
         }
         UserExtend userExtend = userExtendService.getByUserId(userId);
         vo.setIncomeCoin(userExtend.getIncomeCoin());