From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 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 29210cf..b03f406 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
@@ -32,6 +32,7 @@
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletionService;
import java.util.stream.Collectors;
/**
@@ -70,13 +71,43 @@
@Autowired
private AppUserClient appUserClient;
+
/**
* 获取赛事报名记录
*/
@ResponseBody
@RequestMapping("/base/competition/listAllPayment")
public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
- return paymentCompetitionService.listAll(query);
+ List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
+ List<PaymentCompetition> result = new ArrayList<>();
+ if (query.getOperatorId()!=null){
+ for (PaymentCompetition paymentCompetition : paymentCompetitions) {
+ Integer competitionId = paymentCompetition.getCompetitionId();
+ Competition byId = cttService.getById(competitionId);
+ if (byId!=null){
+ Integer operatorId = byId.getOperatorId();
+ if (operatorId!=null){
+ if (operatorId == query.getOperatorId()){
+ result.add(paymentCompetition);
+ }
+ }
+ }
+ }
+ 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;
}
@ResponseBody
@PostMapping("/base/competition/getPayedCompetitions")
@@ -115,6 +146,14 @@
.eq("appUserId",appUserId)
.eq("payStatus",3));
}
+
+
+ @PostMapping("/base/competition/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return paymentCompetitionService.queryByCode(code);
+ }
+
@@ -583,11 +622,12 @@
ids.add(-1);
}
ArrayList<Object> integers = new ArrayList<>();
- List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
int year = DateUtil.year(new Date());
+
for (int i = 0; i < 10; i++) {
integers.add(year-i);
}
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
// 年
ArrayList<Integer> years = new ArrayList<>();
ArrayList<Integer> yearsUser = new ArrayList<>();
@@ -601,6 +641,8 @@
map.put("yearData",years);
map.put("yearsUser",yearsUser);
// 月
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
ArrayList<Integer> months = new ArrayList<>();
ArrayList<Integer> monthsUser = new ArrayList<>();
for (int i = 1; i <= 12; i++) {
--
Gitblit v1.7.1