From 51f34c714fc3c7a4551d349a918e7ce8fa7f63c2 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 08 三月 2024 18:04:56 +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 | 157 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 138 insertions(+), 19 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 44ae8f8..4a1769b 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
@@ -149,12 +149,17 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
public ResultUtil<WorldCupPeopleVo> getWorldCupPeople(WorldCupPeople worldCupPeople){
- WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getById(worldCupPeople.getCode());
+ JSONObject jsonObject = JSON.parseObject(worldCupPeople.getCode());
+ Long id = jsonObject.getLong("id");
+ Integer isStudent = jsonObject.getInteger("isStudent");
+ if(0 == isStudent){
+ isStudent = 2;
+ }
+ WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>()
+ .eq("worldCupId", worldCupPeople.getWorldCupId()).eq("participantId", id).eq("participantType", isStudent)
+ .orderByDesc("createTime").last(" limit 0, 1"));
if(null == worldCupPaymentParticipant){
return ResultUtil.error("无效二维码");
- }
- if(worldCupPaymentParticipant.getWorldCupId().compareTo(worldCupPeople.getWorldCupId()) != 0){
- return ResultUtil.error("报名失败，当前用户未报名当前比赛");
}
WorldCupPeopleVo worldCupPeopleVo = new WorldCupPeopleVo();
worldCupPeopleVo.setId(worldCupPaymentParticipant.getId());
@@ -186,7 +191,7 @@
@ApiImplicitParam(name = "code", value = "扫码结果", required = true, dataType = "String"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<Map<String, String>> getDeviceInformation(@RequestBody String code){
+ public ResultUtil<Map<String, String>> getDeviceInformation(String code){
/**
* {
* "scan_type": 0, // 扫码类型：1000：游戏，1001:课程，1002:场地
@@ -201,14 +206,13 @@
return ResultUtil.error("二维码不正确");
}
Integer space_id = jsonObject.getInteger("space_id");
- Site site = siteClient.getSite(space_id);
- if(null == site){
+ Store store = storeClient.queryStoreById(space_id);
+ if(null == store){
return ResultUtil.error("无法获取场地信息");
}
- Store store = storeClient.queryStoreById(site.getStoreId());
Map<String, String> map = new HashMap<>();
map.put("name", store.getName());
- map.put("address", site.getName());
+ map.put("address", store.getAddress());
return ResultUtil.success(map);
}
@@ -270,7 +274,7 @@
@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(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){
+ public ResultUtil<WorldCupInfo> getWorldCupInfo(Integer id,String lon, String lat){
WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat);
return ResultUtil.success(worldCupInfo);
}
@@ -391,7 +395,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));
}
@@ -404,8 +408,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();
+ }
}
@@ -451,11 +465,24 @@
@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);
+ }
+
+ @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);
}
@@ -481,8 +508,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();
+ }
}
@@ -645,8 +682,8 @@
*/
@ResponseBody
@PostMapping("/base/worldCup/endWorldCupCallback")
- public void endWorldCupCallback(){
-
+ public void endWorldCupCallback(String custom, Integer red_score, Integer blue){
+ worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue);
}
@@ -679,4 +716,86 @@
out.close();
}
}
+
+
+ /**
+ * 获取已报名人员列表
+ * @param registeredPersonnel
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getRegisteredPersonnel")
+ public Map<String, Object> getRegisteredPersonnel(@RequestBody RegisteredPersonnel registeredPersonnel){
+ return worldCupPaymentParticipantService.getRegisteredPersonnel(registeredPersonnel);
+ }
+
+
+ /**
+ * 获取比赛排行榜列表数据
+ * @param worldCupRecords
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/worldCupRecordsList")
+ 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