This commit is contained in:
张良(004796)
2024-03-25 19:13:06 +08:00
parent 0e46e316bb
commit 8a89c53258
25 changed files with 468 additions and 15 deletions

View File

@@ -46,6 +46,9 @@ public class DynamicListVo {
@Schema(description = "内容")
private String content;
@Schema(description = "点赞数")
private Long starNum;
@Schema(description = "图片列表")
private List<String> imageList;

View File

@@ -3,14 +3,38 @@ package com.ruoyi.xq.dto.app.dynamic;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDate;
@Data
public class DynamicQuery {
@Schema(hidden = true)
private LocalDate birthdayBegin;
@Schema(hidden = true)
private LocalDate birthdayEnd;
@Schema(description = "性别 1-女 2-男")
private Integer gender;
@Schema(description = "居住城市")
private String residenceCity;
@Schema(description = "年龄-开始")
private Integer ageBegin;
@Schema(description = "年龄-结束")
private Integer ageEnd;
@Schema(description = "居住地")
private String residenceCode;
@Schema(description = "1-最新发布 2-热门动态")
private Integer sortBy = 1;
public void initBirthdayByAge(){
if(this.ageBegin != null && this.ageBegin > 0){
this.birthdayEnd = LocalDate.now().plusYears(-ageBegin);
}
if(this.ageEnd != null && this.ageEnd > 0){
this.birthdayBegin= LocalDate.now().plusYears(-ageEnd);
}
}
}

View File

@@ -0,0 +1,12 @@
package com.ruoyi.xq.dto.app.dynamic;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@Data
public class DynamicStarReq {
@Schema(description = "动态ID")
private Long dynamicId;
@Schema(description = "1-点赞 2-取消点赞")
private Integer star;
}

View File

@@ -0,0 +1,26 @@
package com.ruoyi.xq.dto.app.dynamic;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Data
public class MyStarDynamicListVO {
@Schema(description = "点赞用户ID")
private Long starUserId;
@Schema(description = "点赞用户编号")
private String starUsercode;
@Schema(description = "点赞用户昵称")
private String starNickname;
@Schema(description = "点赞用户头像")
private String starAvatar;
@Schema(description = "点赞动态ID")
private Long dynamicId;
@Schema(description = "图片列表")
private List<String> imageList;
@Schema(description = "点赞时间")
private LocalDateTime createTime;
}

View File

@@ -0,0 +1,11 @@
package com.ruoyi.xq.dto.app.dynamic;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.scheduling.annotation.Scheduled;
@Data
public class MyStarDynamicQuery {
@Schema(description = "用户ID")
private Long userId;
}

View File

@@ -55,6 +55,14 @@ public class HomePageReq extends PageQuery {
private Integer carStatus;
@Schema(description = "户籍地")
private String addressCode;
}
public void initBirthdayByAge(){
if(this.ageBegin != null && this.ageBegin > 0){
this.birthdayEnd = LocalDate.now().plusYears(-ageBegin);
}
if(this.ageEnd != null && this.ageEnd > 0){
this.birthdayBegin= LocalDate.now().plusYears(-ageEnd);
}
}
}

View File

@@ -0,0 +1,19 @@
package com.ruoyi.xq.dto.app.user.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class AccountInfoVO {
@Schema(description = "用户ID")
private Long userId;
@Schema(description = "收益的余额")
private BigDecimal incomeCoin;
/**
* 交换微信次数
*/
@Schema(description = "交换微信次数")
private Integer wxTransNum;
}

View File

@@ -4,7 +4,9 @@ import com.ruoyi.xq.dto.app.common.UserPicturesDTO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -71,6 +73,24 @@ public class CurrentUserInfoVo {
@Schema(description = "最大认证数量")
private Integer maxAuthNum = 8;
@Schema(description = "是否开通VIP")
private Boolean openVip = false;
@Schema(description = "vip等级")
private Integer vipType;
@Schema(description = "vip到期时间")
private LocalDateTime vipTimeout;
/**
* 收益的余额
*/
@Schema(description = "收益的余额")
private BigDecimal incomeCoin;
/**
* 交换微信次数
*/
@Schema(description = "交换微信次数")
private Integer wxTransNum;
/**
* 相册
*/

View File

@@ -225,4 +225,12 @@ public class HomeUserVo {
@Schema(description = "择偶条件-购车情况")
private Integer filterCarStatus;
@Schema(description = "是否开通VIP")
private Boolean openVip = false;
/**
* @see com.ruoyi.xq.enums.vip.VipTypeEnum
*/
@Schema(description = "开通的VIP类型")
private Integer vipType;
}