更新bug修改

puzhibing

2024-02-05 640ff18d2d7f4be02ddb7f8f75e899f05545eb98

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

@@ -5,6 +5,7 @@
import com.dsh.other.feignclient.model.AdvertisementChangeStateDTO;
import com.dsh.other.feignclient.model.AdvertisementQuery;
import com.dsh.other.model.BannerVo;
import com.dsh.other.model.dto.siteDto.GameDataQuery;
import com.dsh.other.service.*;
import com.dsh.other.util.ResultUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,23 +34,60 @@
    @Autowired
    private TGameRecordService gameRecordService;

    // 数据统计
    @ResponseBody
    @PostMapping("/student/getData")
    public List<TGameRecord> getData(@RequestBody GameDataQuery query){
        if (query.getStoreId()==null){
            // 获取到游戏ids
            List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("operationId", query.getObjectId()))
                    .stream().map(Game::getId).collect(Collectors.toList());
            // 根据游戏ids查询智慧球场支付记录
            QueryWrapper<TGameRecord> wrapper = new QueryWrapper<TGameRecord>().eq("status", 1)
                    .ne("payType", 3)
                    .ne("payType", 4);
            if(gameIds.size() > 0){
                wrapper.in("gameId", gameIds);
            }
            List<TGameRecord> list = gameRecordService.list(wrapper);
            return list;
        }else{
            List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("storeId", query.getStoreId()))
                    .stream().map(Game::getId).collect(Collectors.toList());
            QueryWrapper wrapper = new QueryWrapper<TGameRecord>().eq("status", 1).eq("payType", 1).eq("payType", 2);
            if(gameIds.size() > 0){
                wrapper.in("gameId", gameIds);
            }
            List<TGameRecord> list = gameRecordService.list(wrapper);
            return list;
        }
    }


    @ResponseBody
    @PostMapping("/student/webStudentList")
    public List<Game> list(@RequestBody BallQueryDto ballQueryDto){
        List<Game> games =   gameService.queryAll(ballQueryDto);
    public List<Game> list(@RequestBody BallQueryDto ballQueryDto) {
        List<Game> games = gameService.queryAll(ballQueryDto);
        return games;
    }

    // 根据门店ids 获取游戏记录
    @ResponseBody
    @PostMapping("/game/getGameByStoreIds")
    public List<Integer> getGameByStoreIds(@RequestBody List<Integer> storeIds){
    public List<Integer> getGameByStoreIds(@RequestBody List<Integer> storeIds) {
        // 游戏id
        List<Integer> gamesId = gameService.list(new QueryWrapper<Game>().in("storeId", storeIds))
                .stream().map(Game::getId).collect(Collectors.toList());
        // 根据游戏id获取游戏记录 获取用户Ids
        List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId))
                .stream().map(TGameRecord::getUserId).collect(Collectors.toList());
        return userId;
        if (gamesId.size() == 0) {
            return new ArrayList<>();
        } else {
            // 根据游戏id获取游戏记录 获取用户Ids
            List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId))
                    .stream().map(TGameRecord::getUserId).collect(Collectors.toList());
            return userId;
        }


    }

    @Autowired
@@ -57,10 +95,10 @@

    @ResponseBody
    @PostMapping("/save")
    public Integer save(@RequestBody Game game){
    public Integer save(@RequestBody Game game) {


        if (game.getCityCode()!=null) {
        if (game.getCityCode() != null) {
            Region city = regionService.getOne(new QueryWrapper<Region>().eq("code", game.getCityCode()));
            game.setCity(city.getName());

@@ -72,37 +110,35 @@


        gameService.saveOrUpdate(game);
         System.out.println("==========="+game);
         return  game.getId();
        System.out.println("===========" + game);
        return game.getId();
    }

    @Autowired
    private TGameConfigService config;


    @ResponseBody
    @PostMapping("/saveConfig")
    public void saveConfig(@RequestBody List<TGameConfig> gameConfigList){
        System.out.println("=======gameConfigList===="+gameConfigList);
    public void saveConfig(@RequestBody List<TGameConfig> gameConfigList) {
        System.out.println("=======gameConfigList====" + gameConfigList);
        config.saveOrUpdateBatch(gameConfigList);
//        return  game.getId();
    }

    @ResponseBody
    @PostMapping("/queryGame")
    public Game queryGame(@RequestParam Integer id){
       return gameService.getById(id);
    public Game queryGame(@RequestParam Integer id) {
        return gameService.getById(id);
//        return  game.getId();
    }

    @ResponseBody
    @PostMapping("/listorder")
    public List<Map<String, Object>>  listorder(@RequestBody BookingQuery bookingQuery){
        System.out.println("===bookingQuery===="+bookingQuery);
    public List<Map<String, Object>> listorder(@RequestBody BookingQuery bookingQuery) {
        System.out.println("===bookingQuery====" + bookingQuery);
        return gameService.orderlist(bookingQuery);
//        return  game.getId();
    }




}