记得上下班打卡 | git大法好,push需谨慎

Commit 00f57842 authored by wangyifan's avatar wangyifan

草莓护照V1.1-home页数据过滤签证卡片类型 ;增加查询签证卡片接口

parent 5e155683
......@@ -27,7 +27,7 @@ public class AdamCaomeiPassportBadgeShelfItemVo {
@ApiModelProperty("分享文案")
private String shareText;
@ApiModelProperty("类型 1护照 2演出 3特殊")
@ApiModelProperty("类型 1护照 2演出 3特殊(不含 4 签证页,签证页见签证卡片接口)")
private Integer type;
@ApiModelProperty("关联演出ID(演出纪念徽章、签证页)")
......
......@@ -13,9 +13,9 @@ public class AdamCaomeiPassportHomeVo {
@ApiModelProperty("个人信息卡片")
private AdamCaomeiPassportUserCardVo userCard;
@ApiModelProperty("已认领徽章(全部获得记录,用于网格墙)")
@ApiModelProperty("已认领徽章(用于网格墙;不含 type=4 签证页,签证页见签证卡片列表接口)")
private List<AdamCaomeiPassportUserClaimedBadgeVo> claimedBadges;
@ApiModelProperty("全部上架徽章(扁平列表;演出类含 performanceName,前端可按类型或按演出分组展示)")
@ApiModelProperty("全部上架徽章货架(不含 type=4 签证页;演出类含 performanceName)")
private List<AdamCaomeiPassportBadgeShelfItemVo> allBadges;
}
package com.liquidnet.service.adam.dto.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.liquidnet.commons.lang.util.DateUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* 草莓护照-签证页卡片(type=4,独立展示,不出现在首页徽章货架/徽章墙)
*/
@Data
@ApiModel("草莓护照-签证页卡片")
public class AdamCaomeiVisaCardVo {
@ApiModelProperty("签证页配置ID(徽章ID)")
private String badgeId;
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("副标题")
private String subTitle;
@ApiModelProperty("图标")
private String icon;
@ApiModelProperty("分享文案")
private String shareText;
@ApiModelProperty("关联音乐节/演出ID")
private String performanceId;
@ApiModelProperty("关联音乐节/演出名称")
private String performanceName;
@ApiModelProperty("是否已获得(本接口仅从缓存/库读取已发放记录,恒为 true)")
private boolean claimed;
@ApiModelProperty("获得时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
private Date claimedAt;
}
......@@ -2,6 +2,7 @@ package com.liquidnet.service.adam.service;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiPassportHomeVo;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiPassportUserClaimedBadgeVo;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiVisaCardVo;
import com.liquidnet.service.base.ResponseDto;
import java.util.List;
......@@ -17,10 +18,16 @@ public interface IAdamCaomeiPassportUserService {
ResponseDto<List<AdamCaomeiPassportUserClaimedBadgeVo>> bindPassport(String passportNo);
/**
* 护照首页:个人信息、实名状态、已认领墙、按类型分组的全部上架徽章
* 护照首页:个人信息、实名状态、已认领墙、上架徽章货架;末尾自动发放满足条件的 type=4 签证页(响应中不含签证页)
*/
ResponseDto<AdamCaomeiPassportHomeVo> getPassportHome();
/**
* 签证页卡片列表(type=4):仅从用户已获徽章缓存/库中筛选 type=4。
* 需用户先访问护照首页 {@link #getPassportHome()} 触发静默发放后,本接口才有数据。
*/
ResponseDto<List<AdamCaomeiVisaCardVo>> listVisaCards();
/**
* 校验当前登录用户是否已绑定护照
*/
......
......@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
import com.liquidnet.service.adam.dto.param.AdamCaomeiPassportNoParam;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiPassportHomeVo;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiPassportUserClaimedBadgeVo;
import com.liquidnet.service.adam.dto.vo.AdamCaomeiVisaCardVo;
import com.liquidnet.service.adam.service.IAdamCaomeiPassportUserService;
import com.liquidnet.service.base.ResponseDto;
import io.swagger.annotations.Api;
......@@ -43,6 +44,13 @@ public class AdamCaomeiPassportUserController {
}
@ApiOperationSupport(order = 3)
@ApiOperation("签证页卡片列表:仅从用户已获徽章中筛选 type=4;须先访问护照首页 home 完成静默发放后再查看")
@GetMapping("visa/list")
public ResponseDto<List<AdamCaomeiVisaCardVo>> visaList() {
return adamCaomeiPassportUserService.listVisaCards();
}
@ApiOperationSupport(order = 4)
@ApiOperation("校验当前用户是否已绑定护照")
@GetMapping("/check")
public ResponseDto<Boolean> checkBound() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment