From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001 From: 44323 <443237572@qq.com> Date: 星期一, 27 十一月 2023 17:30:26 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai --- cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 34 +++++++++++++++++----------------- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java index 3343dad..c8903fd 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java @@ -60,20 +60,21 @@ @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()); - if (gamesId.size() == 0){ + if (gamesId.size() == 0) { return new ArrayList<>(); - }else{ + } else { // 根据游戏id获取游戏记录 获取用户Ids List<Integer> userId = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gamesId)) .stream().map(TGameRecord::getUserId).collect(Collectors.toList()); @@ -88,10 +89,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()); @@ -103,37 +104,36 @@ 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(); } - - } -- Gitblit v1.7.1