From 991871770f339eda8bae952d92ad6bad4e9aec4d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 二月 2024 11:57:10 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 124 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 120 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 8e48812..da81fe4 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
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.communityWorldCup.entity.WorldCup;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
+import com.dsh.communityWorldCup.entity.WorldCupStore;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
@@ -14,6 +17,7 @@
import com.dsh.communityWorldCup.feignclient.other.model.Site;
import com.dsh.communityWorldCup.feignclient.other.model.Store;
import com.dsh.communityWorldCup.model.*;
+import com.dsh.communityWorldCup.service.IWorldCupCompetitorService;
import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService;
import com.dsh.communityWorldCup.service.IWorldCupService;
import com.dsh.communityWorldCup.service.IWorldCupStoreService;
@@ -34,10 +38,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 社区世界杯
@@ -79,6 +81,12 @@
@Autowired
private PayMoneyUtil payMoneyUtil;
+
+ @Autowired
+ private IWorldCupStoreService worldCupStoreService;
+
+ @Autowired
+ private IWorldCupCompetitorService worldCupCompetitorService;
@@ -367,4 +375,112 @@
e.printStackTrace();
}
}
+
+
+ /**
+ * 根据店铺id获取有效的世界杯
+ * @param storeId
+ * @return
+ */
+ @PostMapping("/worldCup/getWorldCupStoreList")
+ 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));
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getEntrantRank")
+ @ApiOperation(value = "获取世界杯排名【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<EntrantRankVo> getEntrantRank(EntrantRank entrantRank){
+ EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank);
+ return ResultUtil.success(entrantRank1);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getMyWorldCupList")
+ @ApiOperation(value = "获取报名的世界杯列表【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<WorldCupListVo>> getMyWorldCupList(MyWorldCupList myWorldCupList){
+ List<WorldCupListVo> myWorldCupList1 = worldCupPaymentParticipantService.getMyWorldCupList(myWorldCupList);
+ return ResultUtil.success(myWorldCupList1);
+ }
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getParticipant")
+ @ApiOperation(value = "获取已报名的参赛人员【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<List<ParticipantVo>> getParticipant(){
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.tokenErr();
+ }
+ List<ParticipantVo> participant = worldCupPaymentParticipantService.getParticipant(uid);
+ return ResultUtil.success(participant);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getMyWorldCupInfo")
+ @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<MyWorldCupInfo> getMyWorldCupInfo(@RequestBody String id){
+ MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id);
+ return ResultUtil.success(myWorldCupInfo);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getWorldCupMatchRecord")
+ @ApiOperation(value = "获取比赛记录【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<MatchRecordVo> getWorldCupMatchRecord(MatchRecord matchRecord){
+ MatchRecordVo matchRecord1 = worldCupCompetitorService.getMatchRecord(matchRecord);
+ return ResultUtil.success(matchRecord1);
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/api/worldCup/getWorldCupRank")
+ @ApiOperation(value = "获取比赛排名【2.0】", tags = {"APP-个人中心"})
+ @ApiImplicitParams({
+ @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);
+ }
+
+
+
+
}
--
Gitblit v1.7.1