调整赛区方法

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

@@ -58,8 +58,18 @@ public class SeriesService {
         }
         SeriesDetailsVO result = seriesConverter.toSeriesDetailVO(series, status);
         result.setNoticeList(seriesBusinessMapper.getSeriesNotice(id));
-        result.setApplied(seriesBusinessMapper.checkExistUserSeriesApply(id, sportUserId));
         result.setRoundList(seriesBusinessMapper.getSeriesRound(id));
+        result.setAreaList(seriesBusinessMapper.getSeriesAreaList(id));
+
+        QueryWrapper<SeriesApply> seriesApplyQuery = new QueryWrapper<>();
+        seriesApplyQuery.lambda().eq(SeriesApply::getSeriesId, id).eq(SeriesApply::getSportUserId, sportUserId);
+        SeriesApply seriesApply = seriesApplyMapper.selectOne(seriesApplyQuery);
+        if(seriesApply == null){
+            result.setApplied(false);
+        } else {
+            result.setApplied(true);
+            result.setAreaId(seriesApply.getAreaId());
+        }
         return result;
     }
 
@@ -68,7 +78,7 @@ public class SeriesService {
         SeriesApplyPreLoadVO result = seriesConverter.toSeriesApplyPreLoadVO(sportUser);
         result.setAreaList(seriesBusinessMapper.getSeriesAreaList(seriesId));
         SeriesApply seriesApply = seriesBusinessMapper.getLatestUserSeriesApplyInfo(sportUserId);
-        if(seriesApply!=null){
+        if (seriesApply != null) {
             result.setRealName(seriesApply.getName());
             result.setIdCard(seriesApply.getIdCard());
         }
@@ -77,7 +87,7 @@ public class SeriesService {
     }
 
     public void seriesApply(SeriesApplyDTO dto) {
-        if(seriesBusinessMapper.checkExistUserSeriesApply(dto.getSeriesId(),dto.getSportUserId())){
+        if (seriesBusinessMapper.checkExistUserSeriesApply(dto.getSeriesId(), dto.getSportUserId())) {
             throw new BusinessException("您已经报名当前比赛，无需重复报名");
         }
 

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

@@ -31,9 +31,12 @@ public class SeriesDetailsVO {
     private Integer applyNum;
     @ApiModelProperty("是否已报名 true 报名 false 未报名")
     private Boolean applied;
+    @ApiModelProperty("赛区id")
+    private Long areaId;
     @ApiModelProperty("通知列表")
     List<SeriesNoticeVO> noticeList;
     @ApiModelProperty("轮次列表")
     List<SeriesRoundVO> roundList;
-
+    @ApiModelProperty("赛区列表")
+    List<SeriesAreaVO> areaList;
 }

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/vo/SeriesQualifyingMatchVO.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 SeriesQualifyingMatchVO {
+
+}