From 3ba2d33c27aea91c14bbf34e04e72f3d758a5105 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 22 十一月 2023 19:36:01 +0800
Subject: [PATCH] 11.21.2
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 3 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..9bdf0b2 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
@@ -186,10 +186,14 @@
// integers.add(2);
integers.add(3);
+ ArrayList<Integer> pays = new ArrayList<>();
+ pays.add(2);
+ pays.add(3);
+
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
.eq("appUserId",appUserId)
- .eq("payStatus",2));
+ .in("payStatus",pays));
}
@@ -284,7 +288,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 +317,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 +369,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,"当前赛事仅限已购课学员报名");
}
@@ -610,6 +631,16 @@
wrapper.orderByDesc(Competition::getInsertTime);
Page<Competition> page = cttService.page(competitionPage, wrapper);
+ for (Competition record : page.getRecords()) {
+
+ // 查询当前赛事有多少人报名了
+ List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
+ .eq("competitionId", record.getId()));
+ // 报名数量
+ int temp = competitionId.size();
+ String value = String.valueOf(temp);
+ record.setCount(record.getApplicantsNumber()+"-"+value);
+ }
return page;
}catch (Exception e){
e.printStackTrace();
@@ -655,6 +686,16 @@
@PostMapping("/base/competition/add")
public void add(@RequestBody Competition competition){
try {
+ if (competition.getStartTime().after(new Date())){
+ competition.setStatus(1);
+ }
+ if (competition.getStartTime().before(new Date())){
+ if (competition.getEndTime().after(new Date())){
+ competition.setStatus(2);
+ }else{
+ competition.setStatus(3);
+ }
+ }
competition.setInsertTime(new Date());
cttService.save(competition);
}catch (Exception e){
@@ -665,6 +706,16 @@
@PostMapping("/base/competition/update")
public void update(@RequestBody Competition competition){
try {
+ if (competition.getStartTime().after(new Date())){
+ competition.setStatus(1);
+ }
+ if (competition.getStartTime().before(new Date())){
+ if (competition.getEndTime().after(new Date())){
+ competition.setStatus(2);
+ }else{
+ competition.setStatus(3);
+ }
+ }
cttService.updateById(competition);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1