From 912bf8aad828c5cde67720864c8697d03a1a7bad Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 14:46:17 +0800
Subject: [PATCH] 合并代码
---
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 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 70e36c1..3b9abaa 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
@@ -451,7 +451,7 @@
@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){
+ public ResultUtil<MyWorldCupInfo> getMyWorldCupInfo(String id){
MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id);
return ResultUtil.success(myWorldCupInfo);
}
@@ -504,8 +504,44 @@
*/
@ResponseBody
@PostMapping("/worldCup/winCount")
- public Integer winCount(Integer studentId){
+ public Integer winCount(@RequestBody Integer studentId){
return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
.eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
}
+
+
+ /**
+ * 添加社区世界杯
+ * @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 worldCupListAll
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/worldCup/getWorldCupListAll")
+ public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){
+ return worldCupService.getWorldCupListAll(worldCupListAll);
+ }
}
--
Gitblit v1.7.1