From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 a032a8d..0dcb55c 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
@@ -284,7 +284,11 @@
public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat){
try {
List<CompetitionListVo> competitionListVos = cttService.queryCompetitionList(cityCode, content, registerCondition, heat);
- return ResultUtil.success(competitionListVos);
+ List<CompetitionListVo> filteredList = competitionListVos.stream()
+ .filter(vo -> vo.getStatus() == 1 || vo.getStatus() == 2)
+ .collect(Collectors.toList());
+
+ return ResultUtil.success(filteredList);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -309,6 +313,19 @@
return ResultUtil.tokenErr();
}
CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat);
+
+
+ String dateString = competitionInfo.getRegisterEndTime();
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ Date date = sdf.parse(dateString);
+ if (new Date().after(date)){
+ competitionInfo.setHasPass(1);
+ }else {
+ competitionInfo.setHasPass(0);
+
+ }
+
+
return ResultUtil.success(competitionInfo);
}catch (Exception e){
e.printStackTrace();
@@ -348,7 +365,7 @@
return ResultUtil.tokenErr();
}
if (byId.getRegisterCondition()==3){
- Integer counts = coursePackagePaymentClient.isHave(uid);
+ Integer counts = coursePackagePaymentClient.isHave(paymentCompetitionVo.getIds());
if (counts==0){
return new ResultUtil(0,"当前赛事仅限已购课学员报名");
}
--
Gitblit v1.7.1