Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

Merge remote-tracking branch 'origin/2.0' into 2.0

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

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

@@ -509,6 +509,18 @@
                .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
    }

    /**
     * 获取比赛管理列表数据
     * @param worldCupListAll
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupListAll")
    public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){
        return worldCupService.getWorldCupListAll(worldCupListAll);
    }



    /**
     * 添加社区世界杯
@@ -534,14 +546,53 @@
    }



    /**
     * 获取比赛管理列表数据
     * @param worldCupListAll
     * 编辑社区世界杯
     * @param worldCup
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupListAll")
    public Map<String, Object> getWorldCupListAll(@RequestBody WorldCupListAll worldCupListAll){
        return worldCupService.getWorldCupListAll(worldCupListAll);
    @PostMapping("/worldCup/editWorldCup")
    public Integer editWorldCup(@RequestBody WorldCup worldCup){
        worldCupService.save(worldCup);
        return worldCup.getId();
    }


    /**
     * 删除世界杯门店关系数据
     * @param worldCupId
     */
    @ResponseBody
    @PostMapping("/worldCup/delWorldCupStore")
    public void delWorldCupStore(@RequestBody Integer worldCupId){
        worldCupStoreService.remove(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId));
    }


    /**
     * 根据id获取世界杯赛事数据
     * @param id
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupById")
    public WorldCup getWorldCupById(@RequestBody Integer id){
        return worldCupService.getById(id);
    }


    /**
     * 根据世界杯id获取门店关系数据
     * @param worldCupId
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/getWorldCupStoreAllList")
    public List<WorldCupStore> getWorldCupStoreAllList(@RequestBody Integer worldCupId){
        return worldCupStoreService.list(new QueryWrapper<WorldCupStore>().eq("worldCupId", worldCupId));
    }


}