From 640ff18d2d7f4be02ddb7f8f75e899f05545eb98 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 05 二月 2024 11:56:52 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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..5a5c359 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
@@ -43,16 +43,22 @@
List<Integer> gameIds = gameService.list(new QueryWrapper<Game>().eq("operationId", query.getObjectId()))
.stream().map(Game::getId).collect(Collectors.toList());
// 根据游戏ids查询智慧球场支付记录
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1)
+ QueryWrapper<TGameRecord> wrapper = new QueryWrapper<TGameRecord>().eq("status", 1)
.ne("payType", 3)
- .ne("payType", 4));
+ .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());
- List<TGameRecord> list = gameRecordService.list(new QueryWrapper<TGameRecord>().in("gameId", gameIds)
- .eq("status", 1).eq("payType", 1).eq("payType", 2));
+ 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;
}
}
@@ -60,20 +66,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 +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());
@@ -103,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();
}
-
-
}
--
Gitblit v1.7.1