合并代码

puzhibing

2024-03-01 b85427676fedd373e955f24627764b8e5a29c816

合并代码

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

@@ -384,7 +384,7 @@
     * @return
     */
    @PostMapping("/worldCup/getWorldCupStoreList")
    public List<WorldCupStore> getWorldCupStoreList(Integer storeId){
    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));
@@ -502,7 +502,7 @@
     */
    @ResponseBody
    @PostMapping("/worldCup/winCount")
    public Integer winCount(Integer studentId){
    public Integer winCount(@RequestBody Integer studentId){
        return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
                .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
    }

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/course/CoursePackageOrderStudentClient.java

@@ -21,7 +21,7 @@
     * @param studentId
     * @return
     */
    @PostMapping("/getCoursePackageOrderStudent")
    @PostMapping("/coursePackageOrderStudent/getCoursePackageOrderStudent")
    List<CoursePackageOrderStudent> getCoursePackageOrderStudent(Integer studentId);


@@ -29,6 +29,6 @@
     * 扣减学员课时
     * @param deductionClassHourList
     */
    @PostMapping("/deductionClassHour")
    @PostMapping("/coursePackageOrderStudent/deductionClassHour")
    boolean deductionClassHour(DeductionClassHourList deductionClassHourList);
}

 cloud-server-other/src/main/java/com/dsh/other/controller/HonorController.java

@@ -80,7 +80,7 @@
        List<String> condition5 = vo.getType5().getCondition();
        QueryWrapper<HonorRules> wrapper5 = new QueryWrapper<>();
        wrapper5.eq("type", type5);
        List<HonorRules> list5 = hrService.list(wrapper4);
        List<HonorRules> list5 = hrService.list(wrapper5);
        for (int i = 0; i < list5.size(); i++) {
            list5.get(i).setCondition(Integer.valueOf(condition5.get(i)));
        }