From e4bdceb1434518242484edad2257f00b2499f45b Mon Sep 17 00:00:00 2001 From: huangyw <1207046171@qq.com> Date: Wed, 31 Jul 2024 14:12:09 +0800 Subject: [PATCH] =?UTF-8?q?release:=20=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=AD=E8=BF=94=E5=9B=9E=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/luoo/user/controller/MyController.java | 3 +++ .../com/luoo/user/dto/response/UserRespDTO.java | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/luoo_user/src/main/java/com/luoo/user/controller/MyController.java b/luoo_user/src/main/java/com/luoo/user/controller/MyController.java index dc0d3bb..2da37b0 100644 --- a/luoo_user/src/main/java/com/luoo/user/controller/MyController.java +++ b/luoo_user/src/main/java/com/luoo/user/controller/MyController.java @@ -103,6 +103,9 @@ public class MyController extends BaseController { userRespDTO.setAppleEmail(user.getAppleEmail()); userRespDTO.setEnableNotice(1); userRespDTO.setEnablePush(1); + userRespDTO.setVipStatus(user.getVipStatus()); + userRespDTO.setVipExpireTime(user.getVipExpireTime()); + if (null != user.getEnableNotice()) { userRespDTO.setEnableNotice(user.getEnableNotice()); } diff --git a/luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java b/luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java index 7bc8cc9..6807398 100644 --- a/luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java +++ b/luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java @@ -1,10 +1,13 @@ package com.luoo.user.dto.response; import java.io.Serializable; +import java.time.LocalDate; import java.util.List; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; @Data public class UserRespDTO implements Serializable { @@ -70,4 +73,18 @@ public class UserRespDTO implements Serializable { */ @ApiModelProperty(value = "是否启用推送，0为关闭，1为启用，默认启用") private Integer enablePush; + + /** + * 会员状态 0-未开通 1-生效中 2-已过期 + */ + @ApiModelProperty(value = "会员状态 0-未开通 1-生效中 2-已过期") + private Integer vipStatus; + + /** + * 会员到期时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "会员到期时间") + private LocalDate vipExpireTime; }