Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-22 f6ba3e15355e22767e69f8fc14ae22523f8db8dc

 cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java

@@ -284,7 +284,11 @@
    public ResultUtil<List<CompetitionListVo>> queryCompetitionList(String cityCode, String content, Integer registerCondition, String heat){
        try {
            List<CompetitionListVo> competitionListVos = cttService.queryCompetitionList(cityCode, content, registerCondition, heat);
            return ResultUtil.success(competitionListVos);
            List<CompetitionListVo> filteredList = competitionListVos.stream()
                    .filter(vo -> vo.getStatus() == 1 || vo.getStatus() == 2)
                    .collect(Collectors.toList());

            return ResultUtil.success(filteredList);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
@@ -309,6 +313,19 @@
                return ResultUtil.tokenErr();
            }
            CompetitionInfo competitionInfo = cttService.queryCompetitionInfo(uid, id, lon, lat);


            String dateString = competitionInfo.getRegisterEndTime();
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
            Date date = sdf.parse(dateString);
            if (new Date().after(date)){
                competitionInfo.setHasPass(1);
            }else {
                competitionInfo.setHasPass(0);

            }


            return ResultUtil.success(competitionInfo);
        }catch (Exception e){
            e.printStackTrace();
@@ -348,7 +365,7 @@
                return ResultUtil.tokenErr();
            }
            if (byId.getRegisterCondition()==3){
             Integer counts =    coursePackagePaymentClient.isHave(uid);
             Integer counts =    coursePackagePaymentClient.isHave(paymentCompetitionVo.getIds());
                if (counts==0){
                    return new ResultUtil(0,"当前赛事仅限已购课学员报名");
                }
@@ -610,6 +627,16 @@
            wrapper.orderByDesc(Competition::getInsertTime);

            Page<Competition> page = cttService.page(competitionPage, wrapper);
            for (Competition record : page.getRecords()) {

                // 查询当前赛事有多少人报名了
                List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
                        .eq("competitionId", record.getId()));
                // 报名数量
                int temp = competitionId.size();
                String value = String.valueOf(temp);
                record.setCount(record.getApplicantsNumber()+"-"+value);
            }
            return page;
        }catch (Exception e){
            e.printStackTrace();
@@ -655,6 +682,16 @@
    @PostMapping("/base/competition/add")
    public void add(@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);
                }
            }
            competition.setInsertTime(new Date());
            cttService.save(competition);
        }catch (Exception e){
@@ -665,6 +702,16 @@
    @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);
                }
            }
            cttService.updateById(competition);
        }catch (Exception e){
            e.printStackTrace();