From 3cc41ba03659e9e51f26865fe0d04cf43fbc68fb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 三月 2024 18:15:31 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0

---
 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
index a938a0a..8281e5b 100644
--- a/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
+++ b/cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java
@@ -91,7 +91,16 @@
     @Autowired
     private IWorldCupPaymentService worldCupPaymentService;
 
-
+    /**
+     * 根据门店id获取门店关系数据
+     * @param storeId
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/getWorldCupStoreListByStoreId")
+    public List<WorldCupStore> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
+        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
+    }
 
 
     @ResponseBody
@@ -395,7 +404,7 @@
     public List<WorldCupStore> getWorldCupStoreList(@RequestBody Integer storeId){
         List<WorldCup> worldCupList = worldCupService.list(new QueryWrapper<WorldCup>().in("status", Arrays.asList(1, 2)));
         List<Integer> collect = worldCupList.stream().map(WorldCup::getId).collect(Collectors.toList());
-        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect));
+        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect).eq("isOpen", 1));
     }
 
 
@@ -474,6 +483,17 @@
         return ResultUtil.success(myWorldCupInfo);
     }
 
+    @ResponseBody
+    @PostMapping("/api/worldCup/cancelMyWorldCup")
+    @ApiOperation(value = "取消已报名的世界杯【2.0】", tags = {"APP-个人中心"})
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+    })
+    public ResultUtil cancelMyWorldCup(String id){
+        return worldCupPaymentService.cancelMyWorldCup(id);
+    }
+
 
 
 
@@ -497,8 +517,18 @@
             @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
     })
     public ResultUtil<List<WorldCupRankVo>> getWorldCupRank(WorldCupRank worldCupRank){
-        List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
-        return ResultUtil.success(worldCupRank1);
+        try {
+            Integer uid = tokenUtil.getUserIdFormRedis();
+            if(null == uid){
+                return ResultUtil.tokenErr();
+            }
+            worldCupRank.setAppUserId(uid);
+            List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
+            return ResultUtil.success(worldCupRank1);
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResultUtil.runErr();
+        }
     }
 
 
@@ -719,4 +749,62 @@
     public Map<String, Object> worldCupRecordsList(@RequestBody WorldCupRecords worldCupRecords){
         return worldCupCompetitorService.worldCupRecordsList(worldCupRecords);
     }
+
+
+    /**
+     * 获取比赛统计
+     * @param worldCupGameStatistics
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/worldCupGameStatistics")
+    public Map<String, Object> worldCupGameStatistics(@RequestBody WorldCupGameStatistics worldCupGameStatistics){
+        return worldCupService.worldCupGameStatistics(worldCupGameStatistics);
+    }
+
+
+    /**
+     * 获取比赛统计详情列表
+     * @param worldCupGameStatisticsInfoList
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/worldCupGameStatisticsInfoList")
+    public Map<String, Object> worldCupGameStatisticsInfoList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
+        return worldCupCompetitorService.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList);
+    }
+
+
+    /**
+     * 获取单场参赛详情列表
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/worldCupGameStatisticsListInfo")
+    public Map<String, Object> worldCupGameStatisticsListInfo(@RequestBody WorldCupGameStatisticsListInfo worldCupGameStatisticsListInfo){
+        return worldCupCompetitorService.worldCupGameStatisticsListInfo(worldCupGameStatisticsListInfo);
+    }
+
+
+    /**
+     * 修改比分
+     * @param changeScore
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/changeScore")
+    public void changeScore(@RequestBody ChangeScore changeScore){
+        worldCupCompetitorService.changeScore(changeScore);
+    }
+
+
+    /**
+     * 获取用户比赛记录明细
+     * @param userGameRecordList
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/worldCup/userGameRecordList")
+    public Map<String, Object> userGameRecordList(@RequestBody UserGameRecordList userGameRecordList){
+        return worldCupCompetitorService.userGameRecordList(userGameRecordList);
+    }
 }

--
Gitblit v1.7.1