From 572df690f72ed4a077d934823f261dec39b3cc7d Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期二, 08 九月 2026 17:11:34 +0800
Subject: [PATCH] feat&bug：文档内容修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 75 ++++++-------------------------------
1 files changed, 13 insertions(+), 62 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 694add2..266c167 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
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.poi.excel.ExcelUtil;
+import cn.mb.cloud.common.core.exception.BusinessException;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -139,20 +140,6 @@
List<Integer> operatorId = cttService.list(new QueryWrapper<Competition>()
.eq("operatorId", operatorId1)).stream().map(Competition::getId).collect(Collectors.toList());
query.setUserIds(operatorId);
- } else if (query.getStoreId() != null) {
- List<Competition> list = cttService.list(new QueryWrapper<Competition>());
- List<Integer> integers = new ArrayList<>();
- for (Competition competition : list) {
- for (String s : competition.getStoreId().split(",")) {
- if (s.equals(""+query.getStoreId())){
- integers.add(competition.getId());
- }
- }
- }
- if (integers.isEmpty()){
- integers.add(-1);
- }
- query.setUserIds(integers);
}
List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
List<PaymentCompetition> result = new ArrayList<>();
@@ -171,17 +158,7 @@
}
return result;
} else if (query.getStoreId() != null) {
- for (PaymentCompetition paymentCompetition : paymentCompetitions) {
- Integer competitionId = paymentCompetition.getCompetitionId();
- Competition byId = cttService.getById(competitionId);
- if (byId != null) {
- String storeId = byId.getStoreId();
- if (storeId.contains(query.getStoreId().toString())) {
- result.add(paymentCompetition);
- }
- }
- }
- return result;
+ return paymentCompetitions;
}
return paymentCompetitions;
}
@@ -769,7 +746,8 @@
wrapper.ne(Competition::getAuditStatus,2);
}
wrapper.in(Competition::getStoreId,listQuery.getIds());
- wrapper.orderByDesc(Competition::getInsertTime);
+ wrapper.orderByDesc(Competition::getInsertTime)
+ .orderByDesc(Competition::getId);
Page<Competition> page = cttService.page(competitionPage, wrapper);
for (Competition record : page.getRecords()) {
// 查询当前赛事有多少人报名了
@@ -812,7 +790,8 @@
integers.add(1);
integers.add(3);
wrapper.in(Competition::getAuditStatus, integers);
- wrapper.orderByDesc(Competition::getInsertTime);
+ wrapper.orderByDesc(Competition::getInsertTime)
+ .orderByDesc(Competition::getId);
Page<Competition> page = cttService.page(competitionPage, wrapper);
return page;
@@ -861,41 +840,14 @@
}
}
+ /**
+ * 更新活动配置。
+ *
+ * @param competition 管理端提交的活动信息
+ */
@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);
- }
-
- if(competition.getStatus() == 2){
- //添加勋章数据
- List<PaymentCompetition> list = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .eq("competitionId", competition.getId()).eq("payStatus", 2).eq("state", 1));
- Set<Integer> collect = list.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toSet());
- for (Integer integer : collect) {
- int count = paymentCompetitionService.count(new QueryWrapper<PaymentCompetition>()
- .eq("appUserId", integer).eq("payStatus", 2).eq("state", 1));
- StudentHonor studentHonor = new StudentHonor();
- studentHonor.setAppUserId(integer);
- studentHonor.setHonorType(2);
- studentHonor.setNumber(count);
- studentHonorClient.saveStudentHonor(studentHonor);
- }
- }
- }
- cttService.updateById(competition);
-
-
- } catch (Exception e) {
- e.printStackTrace();
- }
+ public void update(@RequestBody Competition competition) throws BusinessException {
+ cttService.updateCompetition(competition);
}
@Resource
@@ -1234,4 +1186,3 @@
return list1.stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
}
}
-
--
Gitblit v1.7.1