From 20cc9b22e1cdb93d081c6596ec762e9f928e208a Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 05 七月 2023 11:28:25 +0800
Subject: [PATCH] 修复模块中的地址

---
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 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 200a3ea..8a43523 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
@@ -8,13 +8,11 @@
 import com.dsh.competition.service.CompetitionService;
 import com.dsh.competition.service.UserCompetitionService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,8 +37,8 @@
 
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");
 
-    @PostMapping("/competition/getCompetitionsDetails")
-    public List<PurchaseRecordVo> getStuSourseList(@RequestParam("appUserId") Integer appUserId){
+    @PostMapping("/base/competition/getCompetitionsDetails")
+    public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date  endTime, @RequestParam("appUserId") Integer appUserId){
 
         List<PurchaseRecordVo> recordVos = new ArrayList<>();
 
@@ -48,7 +46,7 @@
                 .eq("payType",3 )
                 .eq("auditStatus",2));
         List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());
-        List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(appUserId,comIds);
+        List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(startTime,endTime,appUserId,comIds);
         if (userCompetitions.size() > 0){
             userCompetitions.forEach(coms ->{
                 PurchaseRecordVo recordVo = new PurchaseRecordVo();

--
Gitblit v1.7.1