From 6c6d51775200fc1c17b0cd5fc9464016aed13327 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 05 三月 2024 14:14:08 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 138 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 7 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 6a82e60..e9c955f 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.communityWorldCup.entity.WorldCup;
+import com.dsh.communityWorldCup.entity.WorldCupCompetitor;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
import com.dsh.communityWorldCup.entity.WorldCupStore;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
@@ -263,10 +264,12 @@
@ApiOperation(value = "获取世界杯详情【2.0】", tags = {"APP-社区世界杯"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "世界杯id", required = true, dataType = "int"),
+ @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "string"),
+ @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<WorldCupInfo> getWorldCupInfo(Integer id){
- WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id);
+ public ResultUtil<WorldCupInfo> getWorldCupInfo(Integer id,String lon, String lat){
+ WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat);
return ResultUtil.success(worldCupInfo);
}
@@ -383,7 +386,7 @@
* @return
*/
@PostMapping("/worldCup/getWorldCupStoreList")
- public List<WorldCupStore> getWorldCupStoreList(Integer storeId){
+ 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));
@@ -399,8 +402,18 @@
@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);
+ try {
+ Integer uid = tokenUtil.getUserIdFormRedis();
+ if(null == uid){
+ return ResultUtil.success();
+ }
+ entrantRank.setAppUserId(uid);
+ EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank);
+ return ResultUtil.success(entrantRank1);
+ }catch (Exception e){
+ e.printStackTrace();
+ return ResultUtil.runErr();
+ }
}
@@ -446,10 +459,12 @@
@ApiOperation(value = "获取已报名世界杯详情【2.0】", tags = {"APP-个人中心"})
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "string"),
+ @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id){
- MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id);
+ public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id, String lon, String lat){
+ MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id, lon, lat);
return ResultUtil.success(myWorldCupInfo);
}
@@ -481,6 +496,115 @@
}
+ /**
+ * 获取学员参与数量
+ * @param studentId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/count")
+ public Integer count(@RequestBody Integer studentId){
+ return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantId", studentId).eq("participantType", 1));
+ }
+
+
+ /**
+ * 获取学员世界杯胜利次数
+ * @param studentId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/winCount")
+ public Integer winCount(@RequestBody Integer studentId){
+ return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
+ .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
+ }
+
+ /**
+ * 获取比赛管理列表数据
+ * @param worldCupListAll
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupListAll")
+ public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){
+ return worldCupService.getWorldCupListAll(worldCupListAll);
+ }
+
+
+
+ /**
+ * 添加社区世界杯
+ * @param worldCup
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/addWorldCup")
+ public Integer addWorldCup(@RequestBody WorldCup worldCup){
+ worldCupService.save(worldCup);
+ return worldCup.getId();
+ }
+
+
+ /**
+ * 添加社区世界杯和门店关系数据
+ * @param worldCupStore
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/addWorldCupStore")
+ public void addWorldCupStore(@RequestBody WorldCupStore worldCupStore){
+ worldCupStoreService.save(worldCupStore);
+ }
+
+
+
+ /**
+ * 编辑社区世界杯
+ * @param worldCup
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/editWorldCup")
+ public Integer editWorldCup(@RequestBody WorldCup worldCup){
+ worldCupService.updateById(worldCup);
+ return worldCup.getId();
+ }
+
+
+ /**
+ * 删除世界杯门店关系数据
+ * @param worldCupId
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/delWorldCupStore")
+ public void delWorldCupStore(@RequestBody Integer worldCupId){
+ worldCupStoreService.remove(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId));
+ }
+
+
+ /**
+ * 根据id获取世界杯赛事数据
+ * @param id
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupById")
+ public WorldCup getWorldCupById(@RequestBody Integer id){
+ return worldCupService.getById(id);
+ }
+
+
+ /**
+ * 根据世界杯id获取门店关系数据
+ * @param worldCupId
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupStoreAllList")
+ public List<WorldCupStore> getWorldCupStoreAllList(@RequestBody Integer worldCupId){
+ return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId));
+ }
}
--
Gitblit v1.7.1