From 7cd3dea07f5b7cefad9dea9fd7daf992449aaac8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 18:24:38 +0800
Subject: [PATCH] 修改bug
---
cloud-server-other/src/main/java/com/dsh/other/controller/BallController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 c8903fd..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;
}
}
@@ -132,7 +138,6 @@
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