系列赛完结接口

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/controller/SeriesController.java

@@ -107,9 +107,10 @@ public class SeriesController {
     }
 
     @ApiOperation("12.获取系列赛完结结果")
-    @PostMapping("result/{seriesId}")
-    public ResponseEntity<Result<List<SeriesMatchResultVO>>> getSeriesMatchResult(@PathVariable("seriesId") Long seriesId){
-        return success(seriesService.getSeriesMatchResult(seriesId));
+    @PostMapping("result/{seriesId}/{sportUserId}")
+    public ResponseEntity<Result<List<SeriesMatchResultVO>>> getSeriesMatchResult(@PathVariable("seriesId") Long seriesId,
+                                                                                  @PathVariable("sportUserId") Long sportUserId) {
+        return success(seriesService.getSeriesMatchResult(seriesId, sportUserId));
     }
 
 

server-api/src/main/java/com/antai/sport/http/server/server/api/business/series/mapper/SeriesBusinessMapper.java

@@ -62,4 +62,7 @@ public interface SeriesBusinessMapper {
     List<SeriesMatchForGameServerVO> getSeriesMatchForGameServer(@Param("now") LocalDateTime now);
 
     List<SeriesMatchResultTopVO> getSeriesMatchResult(@Param("seriesId") Long seriesId);
+
+    List<SeriesMatchResultVO> getFinalRoundMatchList(@Param("seriesId") Long seriesId,
+                                                     @Param("sportUserId") Long sportUserId);
 }

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

@@ -365,31 +365,17 @@ public class SeriesService {
         return seriesBusinessMapper.getSeriesMatchForGameServer(LocalDateTime.now());
     }
 
-    public List<SeriesMatchResultVO> getSeriesMatchResult(Long seriesId) {
-        List<SeriesMatchResultVO> result = new ArrayList<>();
-        QueryWrapper<SeriesRound> roundQuery = new QueryWrapper<>();
-        roundQuery.lambda().eq(SeriesRound::getSeriesId, seriesId)
-                .eq(SeriesRound::getStatus, 20)
-                .eq(SeriesRound::getDeleted, DeleteStatus.UNDELETED)
-                .eq(SeriesRound::getFinalRound, true);
-        SeriesRound round = seriesRoundMapper.selectOne(roundQuery);
-        if (round == null) {
-            return result;
-        }
-        QueryWrapper<SeriesMatch> matchQuery = new QueryWrapper<>();
-        matchQuery.lambda().eq(SeriesMatch::getDeleted, DeleteStatus.UNDELETED)
-                .eq(SeriesMatch::getStatus, 20)
-                .eq(SeriesMatch::getRoundId, round.getId());
-        List<SeriesMatch> matchList = seriesMatchMapper.selectList(matchQuery);
-        if (matchList.isEmpty()) {
+    public List<SeriesMatchResultVO> getSeriesMatchResult(Long seriesId, Long sportUserId) {
+        List<SeriesMatchResultVO> result = seriesBusinessMapper.getFinalRoundMatchList(seriesId,
+                sportUserId);
+        if (result.isEmpty()) {
             return result;
         }
 
         Map<Long, SeriesMatchResultVO> resultMap = new HashMap<>();
-        for (SeriesMatch match : matchList) {
-            SeriesMatchResultVO resultVO = new SeriesMatchResultVO(match);
-            result.add(resultVO);
-            resultMap.put(resultVO.getId(), resultVO);
+        for (SeriesMatchResultVO match : result) {
+            match.setMatchResultTopList(new ArrayList<>());
+            resultMap.put(match.getId(), match);
         }
 
         List<SeriesMatchResultTopVO> topList = seriesBusinessMapper.getSeriesMatchResult(seriesId);

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

 package com.antai.sport.http.server.server.api.business.series.vo;
 
-import com.antai.sport.http.server.repository.series.entity.SeriesMatch;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @ApiModel("系列赛完结比赛对象")
 @Data
 @NoArgsConstructor
 public class SeriesMatchResultVO {
-
-    public SeriesMatchResultVO (SeriesMatch match){
-        this.id = match.getId();
-        this.name = match.getName();
-        this.matchResultTopList = new ArrayList<>();
-    }
-
     @ApiModelProperty("比赛id")
     private Long id;
     @ApiModelProperty("比赛名称")
     private String name;
+    @ApiModelProperty("我的排名")
+    private Integer myRank;
     @ApiModelProperty("系列赛完结Top选手")
     private List<SeriesMatchResultTopVO> matchResultTopList;
 }

server-api/src/main/resources/mapper/series/SeriesBusinessMapper.xml

@@ -191,6 +191,31 @@
           )
         order by t1.match_id,t1.match_rank
     </select>
+    
+    <select id="getFinalRoundMatchList" resultType="com.antai.sport.http.server.server.api.business.series.vo.SeriesMatchResultVO">
+        select id,name,my_rank
+        from (
+          select id,name,show_order,my_rank,if(my_rank is null,2,1) as base_order
+          from (
+            select t1.id,t1.name,t1.show_order,
+                 (select s1.match_rank
+                  from series_match_player_record s1
+                  where s1.match_id = t1.id
+                    and s1.player_id = #{sportUserId} limit 1) as my_rank
+            from series_match t1
+            where t1.deleted = 0 and t1.status = 20
+              and t1.round_id in (
+                select id
+                from series_round w1
+                where w1.deleted = 0
+                  and w1.status = 20
+                  and w1.final_round = 1
+                  and w1.series_id = #{seriesId}
+              )
+          ) wrapper2
+        ) wrapper1
+        order by base_order,show_order,id
+    </select>
 
 
 </mapper>
\ No newline at end of file