From 2fbb702bad7cf51c9cec5045816c71af4495b060 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 06 三月 2024 20:19:47 +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 | 66 +++++++++++++++++++++++++++++----
1 files changed, 58 insertions(+), 8 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 91f3a1a..67cbde7 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());
@@ -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);
}
@@ -715,4 +719,50 @@
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);
+ }
}
--
Gitblit v1.7.1