From edb2fff00f6990217f7c39ebc2adb611a1c60478 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期六, 28 十月 2023 11:21:57 +0800
Subject: [PATCH] 10.28
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 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 56f4884..62ddfb2 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
@@ -79,6 +79,13 @@
@ResponseBody
@RequestMapping("/base/competition/listAllPayment")
public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
+ Integer operatorId1 = query.getOperatorId();
+ if (operatorId1!=null){
+ // 赛事集合id
+ List<Integer> operatorId = cttService.list(new QueryWrapper<Competition>()
+ .eq("operatorId", operatorId1)).stream().map(Competition::getId).collect(Collectors.toList());
+ query.setUserIds(operatorId);
+ }
List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
List<PaymentCompetition> result = new ArrayList<>();
if (query.getOperatorId()!=null){
@@ -140,12 +147,14 @@
@PostMapping("/base/competition/getPlayPaiFGoldPayRecord")
public List<PaymentCompetition> getPlayPaiFGoldPayRecord(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
- integers.add(1);
- integers.add(2);
+// integers.add(1);
+// integers.add(2);
+ integers.add(3);
+
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
.eq("appUserId",appUserId)
- .eq("payStatus",3));
+ .eq("payStatus",2));
}
@@ -242,6 +251,10 @@
+
+ @Autowired
+ private CompetitionService competitionService;
+
@ResponseBody
@PostMapping("/api/competition/paymentCompetition")
@ApiOperation(value = "赛事报名", tags = {"APP-赛事活动列表"})
@@ -251,10 +264,28 @@
})
public ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo){
try {
+
+
+ Competition byId = competitionService.getById(paymentCompetitionVo.getId());
+ Date date = byId.getEndTime(); // Assuming you have a Date object
+
+ // Check if the date is past the current time
+ boolean isPast = date.after(new Date());
+
+ if (!isPast) {
+ return new ResultUtil(0,"已超过截至报名时间");
+ }
+
+
+
+
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
}
+
+
+
return cttService.paymentCompetition(uid, paymentCompetitionVo);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1