修改bug和新增加功能

puzhibing

2024-03-01 0b43867efe797e23cb881cf78513043c01746adf

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

@@ -2,7 +2,11 @@

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.communityWorldCup.entity.WorldCup;
import com.dsh.communityWorldCup.entity.WorldCupCompetitor;
import com.dsh.communityWorldCup.entity.WorldCupPaymentParticipant;
import com.dsh.communityWorldCup.entity.WorldCupStore;
import com.dsh.communityWorldCup.feignclient.account.AppUserClient;
import com.dsh.communityWorldCup.feignclient.account.StudentClient;
import com.dsh.communityWorldCup.feignclient.account.model.AppUser;
@@ -14,6 +18,7 @@
import com.dsh.communityWorldCup.feignclient.other.model.Site;
import com.dsh.communityWorldCup.feignclient.other.model.Store;
import com.dsh.communityWorldCup.model.*;
import com.dsh.communityWorldCup.service.IWorldCupCompetitorService;
import com.dsh.communityWorldCup.service.IWorldCupPaymentParticipantService;
import com.dsh.communityWorldCup.service.IWorldCupService;
import com.dsh.communityWorldCup.service.IWorldCupStoreService;
@@ -34,10 +39,8 @@
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 社区世界杯
@@ -79,6 +82,12 @@

    @Autowired
    private PayMoneyUtil payMoneyUtil;

    @Autowired
    private IWorldCupStoreService worldCupStoreService;

    @Autowired
    private IWorldCupCompetitorService worldCupCompetitorService;



@@ -255,10 +264,12 @@
    @ApiOperation(value = "获取世界杯详情【2.0】", tags = {"APP-社区世界杯"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "id", value = "世界杯id", required = true, dataType = "int"),
            @ApiImplicitParam(name = "lon", value = "经度", required = true, dataType = "string"),
            @ApiImplicitParam(name = "lat", value = "纬度", required = true, dataType = "string"),
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id){
        WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id);
    public ResultUtil<WorldCupInfo> getWorldCupInfo(@RequestBody Integer id, @RequestBody String lon, @RequestBody String lat){
        WorldCupInfo worldCupInfo = worldCupService.getWorldCupInfo(id, lon, lat);
        return ResultUtil.success(worldCupInfo);
    }

@@ -367,4 +378,134 @@
            e.printStackTrace();
        }
    }


    /**
     * 根据店铺id获取有效的世界杯
     * @param storeId
     * @return
     */
    @PostMapping("/worldCup/getWorldCupStoreList")
    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));
    }




    @ResponseBody
    @PostMapping("/api/worldCup/getEntrantRank")
    @ApiOperation(value = "获取世界杯排名【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<EntrantRankVo> getEntrantRank(EntrantRank entrantRank){
        EntrantRankVo entrantRank1 = worldCupCompetitorService.getEntrantRank(entrantRank);
        return ResultUtil.success(entrantRank1);
    }




    @ResponseBody
    @PostMapping("/api/worldCup/getMyWorldCupList")
    @ApiOperation(value = "获取报名的世界杯列表【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<WorldCupListVo>> getMyWorldCupList(MyWorldCupList myWorldCupList){
        List<WorldCupListVo> myWorldCupList1 = worldCupPaymentParticipantService.getMyWorldCupList(myWorldCupList);
        return ResultUtil.success(myWorldCupList1);
    }


    @ResponseBody
    @PostMapping("/api/worldCup/getParticipant")
    @ApiOperation(value = "获取已报名的参赛人员【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<List<ParticipantVo>> getParticipant(){
        try {
            Integer uid = tokenUtil.getUserIdFormRedis();
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            List<ParticipantVo> participant = worldCupPaymentParticipantService.getParticipant(uid);
            return ResultUtil.success(participant);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }




    @ResponseBody
    @PostMapping("/api/worldCup/getMyWorldCupInfo")
    @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<MyWorldCupInfo> getMyWorldCupInfo(@RequestBody String id){
        MyWorldCupInfo myWorldCupInfo = worldCupPaymentParticipantService.getMyWorldCupInfo(id);
        return ResultUtil.success(myWorldCupInfo);
    }




    @ResponseBody
    @PostMapping("/api/worldCup/getWorldCupMatchRecord")
    @ApiOperation(value = "获取比赛记录【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<MatchRecordVo> getWorldCupMatchRecord(MatchRecord matchRecord){
        MatchRecordVo matchRecord1 = worldCupCompetitorService.getMatchRecord(matchRecord);
        return ResultUtil.success(matchRecord1);
    }



    @ResponseBody
    @PostMapping("/api/worldCup/getWorldCupRank")
    @ApiOperation(value = "获取比赛排名【2.0】", tags = {"APP-个人中心"})
    @ApiImplicitParams({
            @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);
    }


    /**
     * 获取学员参与数量
     * @param studentId
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/count")
    public Integer count(@RequestBody Integer studentId){
        return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
                .eq("participantId", studentId).eq("participantType", 1));
    }


    /**
     * 获取学员世界杯胜利次数
     * @param studentId
     * @return
     */
    @ResponseBody
    @PostMapping("/worldCup/winCount")
    public Integer winCount(Integer studentId){
        return worldCupCompetitorService.count(new QueryWrapper<WorldCupCompetitor>()
                .eq("participantId", studentId).eq("participantType", 1).eq("matchResult", 1));
    }
}