修改bug

puzhibing

2024-03-12 b28d69f6cba1a7aed03fd9c07a14693281f9a9a0

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -91,8 +91,26 @@
    @Autowired
    private IWorldCupPaymentService worldCupPaymentService;



    /**
     * 根据门店id获取门店关系数据
     * @param storeId
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupStoreListByStoreId")
    public List<WorldCupStore> getWorldCupStoreListByStoreId(@RequestBody Integer storeId){
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId));
    }
    /**
     * 根据门店id修改门店关系数据
     * @param worldCupStores
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/updateWorldCupStoreListById")
    public Boolean updateWorldCupStoreListById(@RequestBody List<WorldCupStore> worldCupStores){
        return worldCupStoreService.updateBatchById(worldCupStores);
    }

    @ResponseBody
    @PostMapping("/api/worldCup/getWorldCupStore")
@@ -149,19 +167,24 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<WorldCupPeopleVo> getWorldCupPeople(WorldCupPeople worldCupPeople){
        WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getById(worldCupPeople.getCode());
        JSONObject jsonObject = JSON.parseObject(worldCupPeople.getCode());
        Long id = jsonObject.getLong("id");
        Integer isStudent = jsonObject.getInteger("isStudent");
        if(0 == isStudent){
            isStudent = 2;
        }
        WorldCupPaymentParticipant worldCupPaymentParticipant = worldCupPaymentParticipantService.getOne(new QueryWrapper<WorldCupPaymentParticipant>()
                .eq("worldCupId", worldCupPeople.getWorldCupId()).eq("participantId", id).eq("participantType", isStudent)
                .orderByDesc("createTime").last(" limit 0, 1"));
        if(null == worldCupPaymentParticipant){
            return ResultUtil.error("无效二维码");
        }
        if(worldCupPaymentParticipant.getWorldCupId().compareTo(worldCupPeople.getWorldCupId()) != 0){
            return ResultUtil.error("报名失败，当前用户未报名当前比赛");
        }
        WorldCupPeopleVo worldCupPeopleVo = new WorldCupPeopleVo();
        worldCupPeopleVo.setId(worldCupPaymentParticipant.getId());
        worldCupPeopleVo.setId(worldCupPaymentParticipant.getParticipantId());
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
        if(worldCupPaymentParticipant.getParticipantType() == 1){
            //学员
            TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId());
            TStudent tStudent = studentClient.queryById(worldCupPaymentParticipant.getParticipantId().intValue());
            worldCupPeopleVo.setName(tStudent.getName());
            worldCupPeopleVo.setAge(null == tStudent.getBirthday() ? 0 : Integer.valueOf(sdf.format(new Date())) -Integer.valueOf(sdf.format(tStudent.getBirthday())));
            worldCupPeopleVo.setAvatar(tStudent.getHeadImg());
@@ -201,14 +224,13 @@
            return ResultUtil.error("二维码不正确");
        }
        Integer space_id = jsonObject.getInteger("space_id");
        Site site = siteClient.getSite(space_id);
        if(null == site){
        Store store = storeClient.queryStoreById(space_id);
        if(null == store){
            return ResultUtil.error("无法获取场地信息");
        }
        Store store = storeClient.queryStoreById(site.getStoreId());
        Map<String, String> map = new HashMap<>();
        map.put("name", store.getName());
        map.put("address", site.getName());
        map.put("address", store.getAddress());
        return ResultUtil.success(map);
    }

@@ -391,7 +413,11 @@
    public List<WorldCupStore> getWorldCupStoreList(@RequestBody Integer storeId){
        List<WorldCup> worldCupList = worldCupService.list(new QueryWrapper<WorldCup>().in("status", Arrays.asList(1, 2)));
        List<Integer> collect = worldCupList.stream().map(WorldCup::getId).collect(Collectors.toList());
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect));
        if(collect.size() == 0){
            return new ArrayList<>();
        }
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect)
                .eq("isOpen", 1));
    }


@@ -470,6 +496,17 @@
        return ResultUtil.success(myWorldCupInfo);
    }

    @ResponseBody
    @PostMapping("/api/worldCup/cancelMyWorldCup")
    @ApiOperation(value = "取消已报名的世界杯【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "列表中的id", required = true, dataType = "String"),
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil cancelMyWorldCup(String id){
        return worldCupPaymentService.cancelMyWorldCup(id);
    }




@@ -493,8 +530,18 @@
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<WorldCupRankVo>> getWorldCupRank(WorldCupRank worldCupRank){
        List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
        return ResultUtil.success(worldCupRank1);
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            worldCupRank.setAppUserId(uid);
            List<WorldCupRankVo> worldCupRank1 = worldCupCompetitorService.getWorldCupRank(worldCupRank);
            return ResultUtil.success(worldCupRank1);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }


@@ -601,7 +648,10 @@
        worldCup.setProvinceCode(provinceCode);
        worldCup.setCity(city.replace("市", ""));
        worldCup.setCityCode(cityCode);
        worldCupService.updateById(worldCup);
        WorldCup worldCup1 = worldCupService.getById(worldCup.getId());
        worldCup.setCreateTime(worldCup1.getCreateTime());
        worldCup.setMatchNumber(worldCup1.getMatchNumber());
        worldCupService.updateWorldCupAll(worldCup);
        return worldCup.getId();
    }

@@ -657,8 +707,8 @@
     */
    @ResponseBody
    @PostMapping("/base/worldCup/endWorldCupCallback")
    public void endWorldCupCallback(String custom, Integer red_score, Integer blue){
        worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue);
    public void endWorldCupCallback(String custom, Integer red_score, Integer blue_score){
        worldCupCompetitorService.endWorldCupCallback(custom, red_score, blue_score);
    }


@@ -691,4 +741,94 @@
            out.close();
        }
    }


    /**
     * 获取已报名人员列表
     * @param registeredPersonnel
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getRegisteredPersonnel")
    public Map<String, Object> getRegisteredPersonnel(@RequestBody RegisteredPersonnel registeredPersonnel){
        return worldCupPaymentParticipantService.getRegisteredPersonnel(registeredPersonnel);
    }


    /**
     * 获取比赛排行榜列表数据
     * @param worldCupRecords
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/worldCupRecordsList")
    public Map<String, Object> worldCupRecordsList(@RequestBody WorldCupRecords worldCupRecords){
        return worldCupCompetitorService.worldCupRecordsList(worldCupRecords);
    }


    /**
     * 获取比赛统计
     * @param worldCupGameStatistics
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/worldCupGameStatistics")
    public Map<String, Object> worldCupGameStatistics(@RequestBody WorldCupGameStatistics worldCupGameStatistics){
        return worldCupService.worldCupGameStatistics(worldCupGameStatistics);
    }


    /**
     * 获取比赛统计详情列表
     * @param worldCupGameStatisticsInfoList
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/worldCupGameStatisticsInfoList")
    public Map<String, Object> worldCupGameStatisticsInfoList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
        return worldCupCompetitorService.worldCupGameStatisticsInfoList(worldCupGameStatisticsInfoList);
    }


    /**
     * 获取单场参赛详情列表
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/worldCupGameStatisticsListInfo")
    public Map<String, Object> worldCupGameStatisticsListInfo(@RequestBody WorldCupGameStatisticsListInfo worldCupGameStatisticsListInfo){
        return worldCupCompetitorService.worldCupGameStatisticsListInfo(worldCupGameStatisticsListInfo);
    }


    /**
     * 修改比分
     * @param changeScore
     */
    @ResponseBody
    @PostMapping("/worldCup/changeScore")
    public void changeScore(@RequestBody ChangeScore changeScore){
        worldCupCompetitorService.changeScore(changeScore);
    }


    @ResponseBody
    @PostMapping("/worldCup/getUserGameRecordList")
    public Map<String, Object> getUserGameRecordList(@RequestBody WorldCupGameStatisticsInfoList worldCupGameStatisticsInfoList){
        return worldCupPaymentParticipantService.getUserGameRecordList(worldCupGameStatisticsInfoList);
    }



    /**
     * 获取用户比赛记录明细
     * @param userGameRecordList
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/userGameRecordList")
    public Map<String, Object> userGameRecordList(@RequestBody UserGameRecordList userGameRecordList){
        return worldCupCompetitorService.userGameRecordList(userGameRecordList);
    }
}