系列赛主页数据增加玩家已报名赛区id

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/service/SeriesService.java

@@ -83,6 +83,8 @@ public class SeriesService {
             status = 20;
         }
         SeriesDetailsVO result = seriesConverter.toSeriesDetailVO(series, status);
+        SeriesApply apply = seriesBusinessMapper.getSeriesApply(id, sportUserId);
+        result.setAreaId(apply.getAreaId());
         result.setNoticeList(seriesBusinessMapper.getSeriesNotice(id));
         result.setApplied(seriesBusinessMapper.checkExistUserSeriesApply(id, sportUserId));
         result.setRoundList(seriesBusinessMapper.getSeriesRound(id));

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesDetailsVO.java

@@ -29,6 +29,8 @@ public class SeriesDetailsVO {
     private LocalDateTime applyEndTime;
     @ApiModelProperty("报名数量")
     private Integer applyNum;
+    @ApiModelProperty("玩家报名赛区 null 为未报名")
+    private Long areaId;
     @ApiModelProperty("是否已报名 true 报名 false 未报名")
     private Boolean applied;
     @ApiModelProperty("通知列表")

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesKnockoutMatchDetailVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@ApiModel("淘汰赛比赛数据")
+@Data
+public class SeriesKnockoutMatchDetailVO {
+    @ApiModelProperty("比赛id")
+    public Long id;
+    @ApiModelProperty("比赛名称")
+    public String name;
+    @ApiModelProperty("logo")
+    private String logo;
+    @ApiModelProperty("地图")
+    private String map;
+    @ApiModelProperty("赛道")
+    private String path;
+    @ApiModelProperty("允许进入时间 yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime entryTime;
+    @ApiModelProperty("开始比赛时间 yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startTime;
+    @ApiModelProperty("比赛结束时间 yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endTime;
+    @ApiModelProperty("长度")
+    private BigDecimal distance;
+    @ApiModelProperty("爬坡高度")
+    private BigDecimal climbDistance;
+    @ApiModelProperty("选手数量")
+    private Integer userNum;
+    @ApiModelProperty("赛事描述")
+    private String description;
+}

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesKnockoutMatchHomeVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@ApiModel("淘汰赛主页数据")
+@Data
+public class SeriesKnockoutMatchHomeVO {
+    private SeriesKnockoutMatchListVO myMatch;
+    private List<SeriesKnockoutMatchListVO> matchList;
+}

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesKnockoutMatchListVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("淘汰赛比赛列表VO")
+@Data
+public class SeriesKnockoutMatchListVO {
+}

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesKnockoutMatchRankVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("淘汰赛选手排名")
+@Data
+public class SeriesKnockoutMatchRankVO {
+}

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesKnockoutMatchUserVO.java

+package com.antai.sport.http.server.server.api.business.series.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@ApiModel("淘汰赛选手")
+@Data
+public class SeriesKnockoutMatchUserVO {
+}