玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
lisy
2023-07-06 0ce090ba49e37710a129cf21ac762bbe43bcd50b 
 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java


@@ -4,15 +4,18 @@


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.dsh.competition.entity.Competition;


import com.dsh.competition.entity.UserCompetition;


import com.dsh.competition.feignclient.model.GetStuSourseList;


import com.dsh.competition.feignclient.model.PurchaseRecordVo;


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.*;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;




import java.text.SimpleDateFormat;


import java.util.ArrayList;


import java.util.Date;


import java.util.List;


import java.util.stream.Collectors;




@@ -38,7 +41,7 @@


    private final SimpleDateFormat dateFormat = new SimpleDateFormat("MM-dd HH:mm");




    @PostMapping("/base/competition/getCompetitionsDetails")


    public List<PurchaseRecordVo> getStuSourseList(@RequestParam("startTime") Date startTime, @RequestParam("endTime") Date  endTime, @RequestParam("appUserId") Integer appUserId){


    public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){




        List<PurchaseRecordVo> recordVos = new ArrayList<>();




@@ -46,7 +49,7 @@


                .eq("payType",3 )


                .eq("auditStatus",2));


        List<Integer> comIds = list.stream().map(Competition::getId).collect(Collectors.toList());


        List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(startTime,endTime,appUserId,comIds);


        List<UserCompetition> userCompetitions = ucttService.queryUsersCompetetions(sourseList.getStartTime(),sourseList.getEndTime(),sourseList.getAppUserId(),comIds);


        if (userCompetitions.size() > 0){


            userCompetitions.forEach(coms ->{


                PurchaseRecordVo recordVo = new PurchaseRecordVo();