From c148720d31eb2f8d68352e64eaddf17fd5b66a5a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 07 七月 2023 18:13:14 +0800
Subject: [PATCH] 合并代码
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 6d6a418..c42a1a1 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.competition.entity.Competition;
import com.dsh.competition.entity.UserCompetition;
+import com.dsh.competition.feignclient.model.GetStuSourseList;
import com.dsh.competition.feignclient.model.PurchaseRecordVo;
import com.dsh.competition.model.CompetitionInfo;
import com.dsh.competition.model.CompetitionListVo;
@@ -19,7 +20,6 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -51,7 +51,7 @@
@PostMapping("/base/competition/getCompetitionsDetails")
- public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date endTime, @RequestParam("appUserId") Integer appUserId){
+ public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
List<PurchaseRecordVo> recordVos = new ArrayList<>();
@@ -59,7 +59,7 @@
.eq("payType",3 )
.eq("auditStatus",2));
List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
- List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(startTime,endTime,appUserId,comIds);
+ List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(sourseList.getStartTime(),sourseList.getEndTime(),sourseList.getAppUserId(),comIds);
if (userCompetitions.size() > 0){
userCompetitions.forEach(coms ->{
PurchaseRecordVo recordVo = new PurchaseRecordVo();
@@ -99,18 +99,32 @@
-
- public ResultUtil<CompetitionInfo> queryCompetitionInfo(Integer id){
+ @ResponseBody
+ @PostMapping("/base/competition/queryCompetitionInfo")
+ @ApiOperation(value = "获取赛事详情", tags = {"APP-赛事活动列表"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "赛事id", name = "id", dataType = "int", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResultUtil<CompetitionInfo> queryCompetitionInfo(Integer id, String lon, String lat){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
}
- return null;
+ CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat);
+ return ResultUtil.success(competitionInfo);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
}
}
+
+
+
+
+// public ResultUtil
}
--
Gitblit v1.7.1