Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

44323

2024-03-08 51f34c714fc3c7a4551d349a918e7ce8fa7f63c2

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

@@ -149,12 +149,17 @@
            @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());
@@ -201,14 +206,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 +395,7 @@
    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));
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("storeId", storeId).in("worldCupId", collect).eq("isOpen", 1));
    }


@@ -470,6 +474,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 +508,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();
        }
    }