puzhibing
2024-03-06 9565abe65d1c02229f438b4704373950a5e76cc3
合并代码
4个文件已修改
30 ■■■■■ 已修改文件
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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);
    }
cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/service/impl/WorldCupServiceImpl.java
@@ -160,7 +160,7 @@
        //2、调起开启游戏的接口。
        HashMap<String, String> map = new HashMap<>();
        map.put("sign", "0DB011836143EEE2C2E072967C9F4E4B");
        map.put("space_id", tGame.getSiteId() + "");
        map.put("space_id", tGame.getStoreId() + "");
        map.put("red_sutu_id", tGame.getRed());
        map.put("blue_sutu_id", tGame.getBlue());
        map.put("api_url", "http://221.182.45.100:56666/communityWorldCup/base/worldCup/endWorldCupCallback");
cloud-server-communityWorldCup/src/main/resources/mapper/WorldCupCompetitorMapper.xml
@@ -56,7 +56,7 @@
                from t_world_cup_competitor
                where 1 = 1
                <if test="null != item.year">
                    and DATE_FORMAT(a.startTime, '%Y') = #{item.year}
                    and DATE_FORMAT(startTime, '%Y') = #{item.year}
                </if>
                <if test="null != appUserIds and appUserIds.size() > 0">
                    and appUserId in
@@ -75,7 +75,7 @@
                from t_world_cup_competitor
                where matchResult = 1
                <if test="null != item.year">
                    and DATE_FORMAT(a.startTime, '%Y') = #{item.year}
                    and DATE_FORMAT(startTime, '%Y') = #{item.year}
                </if>
                <if test="null != appUserIds and appUserIds.size() > 0">
                    and appUserId in
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -164,14 +164,14 @@
    }
    @RequestMapping("/base/site/listById")
    public Site listById(@RequestParam("id") Integer id) {
    public Site listById(@RequestBody Integer id) {
        Site byId = siteService.getById(id);
        return byId;
    }
    @RequestMapping("/base/site/listBooks")
    public List<SiteBooking> listBooks(@RequestParam("id") Integer id) {
    public List<SiteBooking> listBooks(@RequestBody Integer id) {
        List<SiteBooking> siteId = siteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id));
        return siteId;
    }